Index: lams_tool_laqa/build.xml
===================================================================
diff -u -r558ead6c7d0ae923be08b6e6cd60ea44839ecfdc -r80a367726b9e7607851be28429bda54d9b306159
--- lams_tool_laqa/build.xml	(.../build.xml)	(revision 558ead6c7d0ae923be08b6e6cd60ea44839ecfdc)
+++ lams_tool_laqa/build.xml	(.../build.xml)	(revision 80a367726b9e7607851be28429bda54d9b306159)
@@ -4,37 +4,42 @@
 <project name="lams_tool_laqa11" basedir="." default="usage">
 
 	<!-- import properties from the specified file -->
-	<property file="build.properties"/>
-	<property file="../lams_build/common.properties"/>
+	<property file="build.properties" />
+	<property file="../lams_build/common.properties" />
 	<property file="../lams_build/${osPropertiesName}.properties" />
-		
+
 	<path id="all-libs">
-			<fileset dir="${sharedlib}">
-				<include name="**/*.jar"/>
-			</fileset>
-			<fileset dir="${j2eelibs}">
-					<include name="**/*.jar"/>
-			</fileset>
+		<fileset dir="${sharedlib}">
+			<include name="**/*.jar" />
+		</fileset>
+		<fileset dir="${j2eelibs}">
+			<include name="**/*.jar" />
+		</fileset>
 	</path>
-		
+
+	<path id="schemaexport.classpath">
+		<path refid="project.classpath" />
+		<pathelement location="${build.classes.java}" />
+	</path>
+
 	<path id="project.classpath">
-		<path refid="all-libs"/>
+		<path refid="all-libs" />
 		<!-- Java CLASSPATH should be added as the last item -->
 		<!-- This property is supposed to be set in eclipse  -->
-		<pathelement location="${java.class.path}"/>
+		<pathelement location="${java.class.path}" />
 	</path>
-	
+
 	<target name="usage">
-			<echo message=""/>
-			<echo message="${project} build file"/>
-			<echo message="------------------------------------------------------"/>
-			<echo message=""/>
-			<echo message="Among the available targets are:"/>
-			<echo message=""/>
+		<echo message="" />
+		<echo message="${project} build file" />
+		<echo message="------------------------------------------------------" />
+		<echo message="" />
+		<echo message="Among the available targets are:" />
+		<echo message="" />
 	</target>
-	
+
 	<target name="init">
-			<available property="xdoclet-jars-installed" file="${sharedlib}/xdoclet/xdoclet-${xdoclet.version}.jar"/>
+		<available property="xdoclet-jars-installed" file="${sharedlib}/xdoclet/xdoclet-${xdoclet.version}.jar" />
 	</target>
 	<!-- =================================================================== -->
 	<!-- Fails if XDoclet 1.2.x is not on classpath                          -->
@@ -51,102 +56,89 @@
 		      
 	      It's also possible to download the jars manually.
 	     </fail>
-		</target>
+	</target>
 
-		<target name="check-driver-present">
-			<available file="${db.driver.jar}" type="file" property="driver.present"/>
-		</target>
-		<target name="panic-if-driver-not-present" unless="driver.present">
-			<fail>
+	<target name="check-driver-present">
+		<available file="${db.driver.jar}" type="file" property="driver.present" />
+	</target>
+	<target name="panic-if-driver-not-present" unless="driver.present">
+		<fail>
 		      The JDBC driver you have specified by including one of the files in ${basedir}/config/database
 		      doesn't exist. You have to download this driver separately and put it in ${db.driver.jar}
 		      Please make sure you're using a version that is equal or superior to the one we looked for.
 		      If you name the driver jar file differently, please update the db.driver.jar property
 		      in the ${basedir}/config/database/xxx.xml file accordingly.
 		     </fail>
-	   </target>
+	</target>
 	<!-- =================================================================== -->
 	<!-- Run Middlegen For LearningDesign                                                       -->
 	<!-- =================================================================== -->
-		<target name="middlegen" description="Run Middlegen For QA Tool" unless="middlegen.skip" depends="init,fail-if-no-xdoclet-1.2.x,check-driver-present,panic-if-driver-not-present">
-			<taskdef name="middlegen" classname="middlegen.MiddlegenTask" classpathref="all-libs" />
-			
-			<middlegen appname="lams_tool_laqa11" 
-					   prefsdir="${conf.middlegen.dir}"
-					   gui="${middlegen.gui}"
-					   databaseurl="${db.url}"
-					   driver="${db.driver}"
-					   username="${db.username}"
-					   password="${db.password}"
-					   includeViews="false"
-			>
+	<target name="middlegen" description="Run Middlegen For QA Tool" unless="middlegen.skip" depends="init,fail-if-no-xdoclet-1.2.x,check-driver-present,panic-if-driver-not-present">
+		<taskdef name="middlegen" classname="middlegen.MiddlegenTask" classpathref="all-libs" />
 
-				<hibernate destination="${conf.hibernate.mapping.dir}"
-						   package="${laqa11.package}" 
-						   genXDocletTags="true"
-						   javaTypeMapper="middlegen.plugins.hibernate.HibernateJavaTypeMapper"
-				/>
-				
-				<table name="tl_lasbmt11_content"/>
-				<table name="tl_lasbmt11_report"/>
-				<table name="tl_lasbmt11_session"/>
-				<table name="tl_lasbmt11_submission_details"/>
-			</middlegen>
+		<middlegen appname="lams_tool_laqa11" prefsdir="${conf.middlegen.dir}" gui="${middlegen.gui}" databaseurl="${db.url}" driver="${db.driver}" username="${db.username}" password="${db.password}" includeViews="false">
 
-		</target>
+			<hibernate destination="${conf.hibernate.mapping.dir}" package="${laqa11.package}" genXDocletTags="true" javaTypeMapper="middlegen.plugins.hibernate.HibernateJavaTypeMapper" />
 
-	
-		<!-- ================================================================ -->
-		<!-- Preparations									                  -->
-		<!-- ================================================================ -->
-		
-		<target name="clean" description="removes all class files">
-			<delete dir="${build}"/>
-			<mkdir dir="${build}"/>
-			<mkdir dir="${build.classes.java}"/>
-			<mkdir dir="${build.classes.test}"/>
-			<mkdir dir="${build.report}"/>
-			<mkdir dir="${build.lib}"/>
-			<mkdir dir="${build.deploy}"/>
-		</target>
+			<table name="tl_lasbmt11_content" />
+			<table name="tl_lasbmt11_report" />
+			<table name="tl_lasbmt11_session" />
+			<table name="tl_lasbmt11_submission_details" />
+		</middlegen>
 
-		<target name="compile" depends="clean" description="compile java sources">
-			<javac srcdir="${src.java.dir}" compiler="modern"
-		         	 	destdir="${build.classes.java}" deprecation="on" debug="on">
-				<classpath>					
-					<path refid="project.classpath"/>
-				</classpath>
-				</javac>
-				<copy overwrite="yes" todir="${build.classes.java}/org/lamsfoundation/lams/tool/qa/">
-								<fileset dir="${src.java.dir}/org/lamsfoundation/lams/tool/qa/">
-										<include name="*.xml"/>
-										<include name="*.properties"/>
-					   				    <exclude name="web.xml"/>
-										<!-- Autopatch -->
-										<include name="dbupdates/*.sql"/>
-										<include name="dbupdates/autopatchContext.xml"/>
-								</fileset>
-				</copy>						
-		</target>
+	</target>
 
-		<target name="compile.test" depends="compile">
-			<javac srcdir="${src.test.dir}" destdir="${build.classes.test}" compiler="modern">
-				<classpath>
-					<pathelement location="${build.classes.java}"/>
-					<path refid="project.classpath"/>
-				</classpath>
-			</javac>
-		</target>
-		
-		<target name="copyContext" description="copies the applicationContext.xml files to the web directory">
-			<copy overwrite="yes" todir="${build.web}">
-				<fileset dir="${conf.web.dir}">
-					<include name="**/*.xml"/>
-					<include name="**/*.tld"/>
-					<include name="**/*.jsp"/>
-					<include name="**/*.properties"/>
-				</fileset>
-				</copy>
+
+	<!-- ================================================================ -->
+	<!-- Preparations									                  -->
+	<!-- ================================================================ -->
+
+	<target name="clean" description="removes all class files">
+		<delete dir="${build}" />
+		<mkdir dir="${build}" />
+		<mkdir dir="${build.classes.java}" />
+		<mkdir dir="${build.classes.test}" />
+		<mkdir dir="${build.report}" />
+		<mkdir dir="${build.lib}" />
+		<mkdir dir="${build.deploy}" />
+	</target>
+
+	<target name="compile" depends="clean" description="compile java sources">
+		<javac srcdir="${src.java.dir}" compiler="modern" destdir="${build.classes.java}" deprecation="on" debug="on">
+			<classpath>
+				<path refid="project.classpath" />
+			</classpath>
+		</javac>
+		<copy overwrite="yes" todir="${build.classes.java}/org/lamsfoundation/lams/tool/qa/">
+			<fileset dir="${src.java.dir}/org/lamsfoundation/lams/tool/qa/">
+				<include name="*.xml" />
+				<include name="*.properties" />
+				<exclude name="web.xml" />
+				<!-- Autopatch -->
+				<include name="dbupdates/*.sql" />
+				<include name="dbupdates/autopatchContext.xml" />
+			</fileset>
+		</copy>
+	</target>
+
+	<target name="compile.test" depends="compile">
+		<javac srcdir="${src.test.dir}" destdir="${build.classes.test}" compiler="modern">
+			<classpath>
+				<pathelement location="${build.classes.java}" />
+				<path refid="project.classpath" />
+			</classpath>
+		</javac>
+	</target>
+
+	<target name="copyContext" description="copies the applicationContext.xml files to the web directory">
+		<copy overwrite="yes" todir="${build.web}">
+			<fileset dir="${conf.web.dir}">
+				<include name="**/*.xml" />
+				<include name="**/*.tld" />
+				<include name="**/*.jsp" />
+				<include name="**/*.properties" />
+			</fileset>
+		</copy>
 		<!--
 			<copy overwrite="yes" todir="${build.web.includes}">	
 					<fileset dir="${conf.includes.dir}">
@@ -159,74 +151,73 @@
 					</fileset>
 				</copy>
 		-->
-		</target>
-	
-		<!-- ================================================================ -->
-		<!-- Make jar archive for deployment        		    	          -->
-		<!-- ================================================================ -->
-		<target name="lams-laqa11-jar" depends="compile,compile.test,copyContext" description="creates jar file">
-			<delete file="${build.lib}/${product}.jar"/>
-			<jar jarfile="${build.lib}/${product}.jar" manifest="${conf.dir}/jar/META-INF/MANIFEST.MF">
-				<fileset dir="${build.classes.java}"/>
-				<fileset dir="${conf.hibernate.mapping.dir}"/>
-				<fileset dir="${build.web}"/>
-				<!--<fileset dir="${build.web.includes}"/>-->
-				<!--<fileset dir="${build.web.template}"/>-->
-			</jar>
-		</target>
-	
-	   <!-- =================================================================== -->
-	   <!-- Run xdoclet			                                                -->
-	   <!-- =================================================================== -->
-	   	<taskdef name="webdoclet" classname="xdoclet.modules.web.WebDocletTask">
-		    <classpath refid="all-libs"/>
-		</taskdef>
-		
-		<target name="webdoclet" depends="clean">
-			<webdoclet destdir="${generated.java}" force="${xdoclet.force}">
+	</target>
 
-	         <fileset dir="${src.java.dir}">
-	            <include name="**/*Action.java" />
-	            <include name="**/*Form.java" />
-	         </fileset>
+	<!-- ================================================================ -->
+	<!-- Make jar archive for deployment        		    	          -->
+	<!-- ================================================================ -->
+	<target name="lams-laqa11-jar" depends="compile,compile.test,copyContext" description="creates jar file">
+		<delete file="${build.lib}/${product}.jar" />
+		<jar jarfile="${build.lib}/${product}.jar" manifest="${conf.dir}/jar/META-INF/MANIFEST.MF">
+			<fileset dir="${build.classes.java}" />
+			<fileset dir="${conf.hibernate.mapping.dir}" />
+			<fileset dir="${build.web}" />
+			<!--<fileset dir="${build.web.includes}"/>-->
+			<!--<fileset dir="${build.web.template}"/>-->
+		</jar>
+	</target>
 
-	         <deploymentdescriptor servletspec="2.3" destdir="${conf.webinf.dir}"
-				mergedir="${conf.xdoclet.dir}" sessiontimeout="${sessiontimeout}"/>
-				
-	      <!--   <strutsconfigxml destdir="${conf.struts.dir}" mergedir="${conf.xdoclet.dir}" version="1.2" /> -->
-	      </webdoclet>
-	   </target>
-	
-	   <!-- ================================================ -->
-	   <!-- Make the WAR archive for deployment				 -->
-	   <!-- ================================================ -->	
-		
-	   <target name="lams-laqa11-war" depends="lams-laqa11-jar" description="creates war file">
-	   		<delete file="${build.lib}/${product}.war"/>	
-	   		<war warfile="${build.lib}/${product}.war" manifest="${conf.dir}/war/META-INF/MANIFEST.MF"
-	   			 webxml="${conf.webinf.dir}/web.xml">
-	   			
-	   			<webinf dir="${conf.webinf.dir}">
-	   				<include name=".xml"/>
-	   				<include name="**/*.*"/>
-	   				<exclude name="web.xml"/>
-	   			</webinf>
+	<!-- =================================================================== -->
+	<!-- Run xdoclet			                                                -->
+	<!-- =================================================================== -->
+	<taskdef name="webdoclet" classname="xdoclet.modules.web.WebDocletTask">
+		<classpath refid="all-libs" />
+	</taskdef>
 
-	   			<!-- <classes dir="${build.classes.java}"/>	 -->
-	   			
-	   			<fileset dir="${conf.web.dir}">
-						<include name="*"/>
-						<include name="authoring/*"/>
-		   				<include name="css/**"/>	   				
-		   				<include name="export/*"/>
-	  					<include name="images/**"/>
-						<include name="common/*"/>
-						<include name="layout/*"/>
-						<include name="includes/*"/>	   				
-						<include name="learning/*"/>
-		   				<include name="monitoring/*"/>
-				</fileset>
-				<!--
+	<target name="webdoclet" depends="clean">
+		<webdoclet destdir="${generated.java}" force="${xdoclet.force}">
+
+			<fileset dir="${src.java.dir}">
+				<include name="**/*Action.java" />
+				<include name="**/*Form.java" />
+			</fileset>
+
+			<deploymentdescriptor servletspec="2.3" destdir="${conf.webinf.dir}" mergedir="${conf.xdoclet.dir}" sessiontimeout="${sessiontimeout}" />
+
+			<!--   <strutsconfigxml destdir="${conf.struts.dir}" mergedir="${conf.xdoclet.dir}" version="1.2" /> -->
+		</webdoclet>
+	</target>
+
+	<!-- ================================================ -->
+	<!-- Make the WAR archive for deployment				 -->
+	<!-- ================================================ -->
+
+	<target name="lams-laqa11-war" depends="lams-laqa11-jar" description="creates war file">
+		<delete file="${build.lib}/${product}.war" />
+		<war warfile="${build.lib}/${product}.war" manifest="${conf.dir}/war/META-INF/MANIFEST.MF" webxml="${conf.webinf.dir}/web.xml">
+
+			<webinf dir="${conf.webinf.dir}">
+				<include name=".xml" />
+				<include name="**/*.*" />
+				<exclude name="web.xml" />
+			</webinf>
+
+			<!-- <classes dir="${build.classes.java}"/>	 -->
+
+			<fileset dir="${conf.web.dir}">
+				<include name="*" />
+				<include name="authoring/*" />
+				<include name="css/**" />
+				<include name="export/*" />
+				<include name="images/**" />
+				<include name="common/*" />
+				<include name="layout/*" />
+				<include name="includes/*" />
+				<include name="learning/*" />
+				<include name="monitoring/*" />
+				<include name="admin/*" />
+			</fileset>
+			<!--
 	   			<fileset dir="${conf.includes.dir}">
 						<include name="*"/>
 				</fileset>
@@ -235,285 +226,244 @@
 				</fileset>
 				-->
 
-	   	   </war>
-	   	
-	   </target>
-	
-	   <target name="copy-tags" depends="" description="copy the lams.tld and the lams tags">
-	   		<copy todir="${conf.webinf.dir}" overwrite="yes" file="${tag.web.dir}/lams.tld" />	
-			<copy todir="${conf.webinf.dir}/tags" overwrite="yes">
-				<fileset dir="${tag.web.dir}/tags">
-					<include name="*.tag" />
-				</fileset>
-			</copy>
-	   </target>
+		</war>
 
-		<!-- =================================================================== -->
-		<!-- Deploy the jar and war                               -->
-		<!-- =================================================================== -->
-			<target name="deploy-war" depends="lams-laqa11-war" description="Deploy the SubmitFiles tool war file and jar file">
-			<delete quiet="true">
-				<fileset dir="${jboss.deploy}/tmp"/>
-				<fileset dir="${jboss.deploy}/work"/>
-			</delete>
-			<copy file="${build.lib}/${product}.jar"
-					todir="${jboss.deploy}"/> 
-			<copy file="${build.lib}/${product}.war"
-					todir="${jboss.deploy}"/> 
-		</target>
-	
-		<!-- =================================================================== -->
-		<!-- Clean and rebuild the database. 									 -->
-		<!-- =================================================================== -->
-		<target name="rebuild-db"
-			description="rebuild QA tables">
-			<sql driver="${db.driver}" url="${db.url}" userid="${db.username}"
-					password="${db.password}"  encoding="${db.encoding}">
-				<classpath>
-					<pathelement location="${db.driver.jar}"/>
-				</classpath>
-				<transaction src="${db.scripts}/drop_lams_tool_qa.sql"/>
-				<transaction src="${db.scripts}/create_lams_tool_qa.sql"/>
-				<transaction src="${db.scripts}/insert_tool_qa_data.sql"/>
-			</sql>
-		</target>
+	</target>
 
-		<!-- =================================================================== -->
-		<!-- Clean tool database. 									 -->
-		<!-- =================================================================== -->
-		<target name="clean-tool-db"
-			description="rebuild qa tables">
-			<sql driver="${db.driver}" url="${db.url}" userid="${db.username}"
-					password="${db.password}"  encoding="${db.encoding}">
-				<classpath>
-					<pathelement location="${db.driver.jar}"/>
-				</classpath>
-				<transaction src="${db.scripts}/drop_lams_tool_qa.sql"/>
-			</sql>
-		</target>
+	<target name="copy-tags" depends="" description="copy the lams.tld and the lams tags">
+		<copy todir="${conf.webinf.dir}" overwrite="yes" file="${tag.web.dir}/lams.tld" />
+		<copy todir="${conf.webinf.dir}/tags" overwrite="yes">
+			<fileset dir="${tag.web.dir}/tags">
+				<include name="*.tag" />
+			</fileset>
+		</copy>
+	</target>
 
-	
-		<!-- =================================================================== -->
-		<!-- Generate the deploy package                                         -->
-		<!-- =================================================================== -->
-		<target name="create-deploy-package" depends="lams-laqa11-war" 
-			description="Generate the deployment package.">
+	<!-- =================================================================== -->
+	<!-- Deploy the jar and war                               -->
+	<!-- =================================================================== -->
+	<target name="deploy-war" depends="lams-laqa11-war" description="Deploy the SubmitFiles tool war file and jar file">
+		<delete quiet="true">
+			<fileset dir="${jboss.deploy}/tmp" />
+			<fileset dir="${jboss.deploy}/work" />
+		</delete>
+		<copy file="${build.lib}/${product}.jar" todir="${jboss.deploy}" />
+		<copy file="${build.lib}/${product}.war" todir="${jboss.deploy}" />
+	</target>
 
-			<path id="deploy.lib.classpath">
-				<fileset dir="${deploy.tool.dir}">
-					<include name="lib/*.jar"/>
-				</fileset>
-			</path> 
-				  
-			<mkdir dir="${build.deploy}"/>
-			<mkdir dir="${build.deploy}/lib"/> 
-			<mkdir dir="${build.deploy}/sql"/> 
-			<mkdir dir="${build.deploy}/language"/>
-			 
-			<copy overwrite="yes" todir="${build.deploy}/sql">
-				<fileset dir="${db.scripts}/">
-					<include name="drop_lams_tool_qa.sql"/>
-					<include name="create_lams_tool_qa.sql"/>
-					<include name="activity_insert.sql"/>
-					<include name="library_insert.sql"/>
-				</fileset>
-			</copy>
-			
-			<copy overwrite="yes" todir="${build.deploy}/sql">
-				<fileset dir="${db.scripts}/">
-					<include name="tool_insert.sql" />
-				</fileset>	
-				<filterset>
-					<filter token="tool_version" value="${tool.version}" />
-				</filterset>
-			</copy>
-			
-			<copy overwrite="yes" todir="${build.deploy}/sql">
-				<fileset dir="${db.scripts}/">
-					<include name="db_version_insert.sql" />
-				</fileset>	
-				<filterset>
-					<filter token="tool_version" value="${tool.version}" />
-					<filter token="signature" value="${signature}" />
-				</filterset>
-			</copy>
-			
-			<copy overwrite="yes" todir="${build.deploy}/sql/updatescripts" failonerror="false">
-				<fileset dir="${db.scripts}/updatescripts/">
-					<include name="*.sql" />
-				</fileset>
-			</copy>
+	<!-- =================================================================== -->
+	<!-- Clean and rebuild the database. 									 -->
+	<!-- =================================================================== -->
+	<target name="rebuild-db" description="rebuild QA tables">
+		<sql driver="${db.driver}" url="${db.url}" userid="${db.username}" password="${db.password}" encoding="${db.encoding}">
+			<classpath>
+				<pathelement location="${db.driver.jar}" />
+			</classpath>
+			<transaction src="${db.scripts}/drop_lams_tool_qa.sql" />
+			<transaction src="${db.scripts}/create_lams_tool_qa.sql" />
+			<transaction src="${db.scripts}/insert_tool_qa_data.sql" />
+		</sql>
+	</target>
 
-			<copy overwrite="yes" todir="${build.deploy}/">
-				<fileset dir="${deploy.tool.dir}">
-					<include name="*.*"/>
-				</fileset>
-			</copy>
+	<!-- =================================================================== -->
+	<!-- Clean tool database. 									 -->
+	<!-- =================================================================== -->
+	<target name="clean-tool-db" description="rebuild qa tables">
+		<sql driver="${db.driver}" url="${db.url}" userid="${db.username}" password="${db.password}" encoding="${db.encoding}">
+			<classpath>
+				<pathelement location="${db.driver.jar}" />
+			</classpath>
+			<transaction src="${db.scripts}/drop_lams_tool_qa.sql" />
+		</sql>
+	</target>
 
-			<copy overwrite="yes" todir="${build.deploy}/lib">
-				<fileset dir="${deploy.tool.dir}/lib">
-					<include name="*.jar"/>
-				</fileset>
-			</copy>
-			
-			<copy overwrite="yes" todir="${build.deploy}/language">
-				<fileset dir="${conf.language.dir}">
-					<include name="*.properties"/>
-				</fileset>
-			</copy>
-			
-			<copy overwrite="true" todir="${build.deploy}">
-					<fileset dir="${build.lib}">
-						<include name="*.jar"/>
-						<include name="*.war"/>
-					</fileset>
-			</copy>
 
-			<taskdef name="generateDeployProperties" 
-				classname="org.lamsfoundation.lams.tool.deploy.CreateToolPackageTask">
-			    <classpath refid="deploy.lib.classpath"/>
-			</taskdef>
+	<!-- =================================================================== -->
+	<!-- Generate the deploy package                                         -->
+	<!-- =================================================================== -->
+	<target name="create-deploy-package" depends="lams-laqa11-war" description="Generate the deployment package.">
 
-			<generateDeployProperties depends="compile" 
-				mode="development" 
-				outputPath="${build.deploy}"
-				generateForInstallers="${generate.for.installers}"
-				dbPassword="${db.password}"
-				dbUsername="${db.username}"
-				dbDriverUrl="${db.url}"
-				dbDriverClass="com.mysql.jdbc.Driver"
-				deployFiles="${build.deploy}/${product}.war,${build.deploy}/${product}.jar"
-				toolJarFileName="${product}.jar"
-				toolSignature="${signature}"
-				toolVersion="${tool.version}"
-				hideTool="${hideTool}"
-				minServerVersionNumber="${min.server.version.number}"
-				toolUpdateScriptPath="${build.deploy}/sql/updatescripts/updateTo${tool.version}.sql"
-				toolTablesScriptPath="${build.deploy}/sql/create_lams_tool_qa.sql" 
-				toolTablesDeleteScriptPath="${build.deploy}/sql/drop_lams_tool_qa.sql" 
-				toolActivityInsertScriptPath="${build.deploy}/sql/activity_insert.sql" 
-				toolLibraryInsertScriptPath="${build.deploy}/sql/library_insert.sql" 
-				toolInsertScriptPath="${build.deploy}/sql/tool_insert.sql" 
-				toolDBVersionScriptPath="${build.deploy}/sql/db_version_insert.sql"
-				toolApplicationContextPath="/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml"
+		<path id="deploy.lib.classpath">
+			<fileset dir="${deploy.tool.dir}">
+				<include name="lib/*.jar" />
+			</fileset>
+		</path>
 
-				lamsEarPath="${jboss.deploy}"
-				toolContext="${toolContext}"
-				toolWebUri="${product}.war"
-				languageFilesPackage="org.lamsfoundation.lams.tool.qa">
+		<mkdir dir="${build.deploy}" />
+		<mkdir dir="${build.deploy}/lib" />
+		<mkdir dir="${build.deploy}/sql" />
+		<mkdir dir="${build.deploy}/language" />
 
-				<!-- language files go as a fileset. Not nice but can't work out how to embed them in a tag. -->
-				<fileset dir="${build.deploy}/language">
-					<include name="**/*.properties"/>
-					<include name="**/*.txt"/>
-				</fileset>
-					
-			</generateDeployProperties>
-		</target>
-	
-		<target name="delete-exploded-tool-folder" description="delete old tool exploded tool folder">
-			<!-- delete old war folder tree -->
-			<delete quiet="true" includeemptydirs="true">
-				<fileset dir="${jboss.deploy}/${product}.war">
-				    <include name="**"/>
-				</fileset>
-			</delete>
-			<!-- if use explode tool target when jboss is running, explode may be failed and left the the temp folder. Here try to delete the temp folder -->
-			<delete quiet="true" includeemptydirs="true">
-				<fileset dir="${jboss.deploy}/temp-${product}.war">
-				    <include name="**"/>
-				</fileset>
-			</delete>
-		</target>
-		
+		<copy overwrite="yes" todir="${build.deploy}/sql">
+			<fileset dir="${db.scripts}/">
+				<include name="drop_lams_tool_qa.sql" />
+				<include name="create_lams_tool_qa.sql" />
+				<include name="activity_insert.sql" />
+				<include name="library_insert.sql" />
+			</fileset>
+		</copy>
 
-		<target name="run-deploy-package" description="Run the deploy tool.">
+		<copy overwrite="yes" todir="${build.deploy}/sql">
+			<fileset dir="${db.scripts}/">
+				<include name="tool_insert.sql" />
+			</fileset>
+			<filterset>
+				<filter token="tool_version" value="${tool.version}" />
+			</filterset>
+		</copy>
 
-			<path id="deploy.classpath">
-				<fileset dir="${build.deploy}">
-					<include name="lib/*.jar"/>
+		<copy overwrite="yes" todir="${build.deploy}/sql">
+			<fileset dir="${db.scripts}/">
+				<include name="db_version_insert.sql" />
+			</fileset>
+			<filterset>
+				<filter token="tool_version" value="${tool.version}" />
+				<filter token="signature" value="${signature}" />
+			</filterset>
+		</copy>
+
+		<copy overwrite="yes" todir="${build.deploy}/sql/updatescripts" failonerror="false">
+			<fileset dir="${db.scripts}/updatescripts/">
+				<include name="*.sql" />
+			</fileset>
+		</copy>
+
+		<copy overwrite="yes" todir="${build.deploy}/">
+			<fileset dir="${deploy.tool.dir}">
+				<include name="*.*" />
+			</fileset>
+		</copy>
+
+		<copy overwrite="yes" todir="${build.deploy}/lib">
+			<fileset dir="${deploy.tool.dir}/lib">
+				<include name="*.jar" />
+			</fileset>
+		</copy>
+
+		<copy overwrite="yes" todir="${build.deploy}/language">
+			<fileset dir="${conf.language.dir}">
+				<include name="*.properties" />
+			</fileset>
+		</copy>
+
+		<copy overwrite="true" todir="${build.deploy}">
+			<fileset dir="${build.lib}">
+				<include name="*.jar" />
+				<include name="*.war" />
+			</fileset>
+		</copy>
+
+		<taskdef name="generateDeployProperties" classname="org.lamsfoundation.lams.tool.deploy.CreateToolPackageTask">
+			<classpath refid="deploy.lib.classpath" />
+		</taskdef>
+
+		<generateDeployProperties depends="compile" mode="development" outputPath="${build.deploy}" generateForInstallers="${generate.for.installers}" dbPassword="${db.password}" dbUsername="${db.username}" dbDriverUrl="${db.url}" dbDriverClass="com.mysql.jdbc.Driver" deployFiles="${build.deploy}/${product}.war,${build.deploy}/${product}.jar" toolJarFileName="${product}.jar" toolSignature="${signature}" toolVersion="${tool.version}" hideTool="${hideTool}" minServerVersionNumber="${min.server.version.number}" toolUpdateScriptPath="${build.deploy}/sql/updatescripts/updateTo${tool.version}.sql" toolTablesScriptPath="${build.deploy}/sql/create_lams_tool_qa.sql" toolTablesDeleteScriptPath="${build.deploy}/sql/drop_lams_tool_qa.sql" toolActivityInsertScriptPath="${build.deploy}/sql/activity_insert.sql" toolLibraryInsertScriptPath="${build.deploy}/sql/library_insert.sql" toolInsertScriptPath="${build.deploy}/sql/tool_insert.sql" toolDBVersionScriptPath="${build.deploy}/sql/db_version_insert.sql" toolApplicationContextPath="/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml" lamsEarPath="${jboss.deploy}" toolContext="${toolContext}" toolWebUri="${product}.war" languageFilesPackage="org.lamsfoundation.lams.tool.qa">
+
+			<!-- language files go as a fileset. Not nice but can't work out how to embed them in a tag. -->
+			<fileset dir="${build.deploy}/language">
+				<include name="**/*.properties" />
+				<include name="**/*.txt" />
+			</fileset>
+
+		</generateDeployProperties>
+	</target>
+
+	<target name="delete-exploded-tool-folder" description="delete old tool exploded tool folder">
+		<!-- delete old war folder tree -->
+		<delete quiet="true" includeemptydirs="true">
+			<fileset dir="${jboss.deploy}/${product}.war">
+				<include name="**" />
+			</fileset>
+		</delete>
+		<!-- if use explode tool target when jboss is running, explode may be failed and left the the temp folder. Here try to delete the temp folder -->
+		<delete quiet="true" includeemptydirs="true">
+			<fileset dir="${jboss.deploy}/temp-${product}.war">
+				<include name="**" />
+			</fileset>
+		</delete>
+	</target>
+
+
+	<target name="run-deploy-package" description="Run the deploy tool.">
+
+		<path id="deploy.classpath">
+			<fileset dir="${build.deploy}">
+				<include name="lib/*.jar" />
+			</fileset>
+		</path>
+
+		<echo>Deploying the QA tool</echo>
+
+		<java classname="org.lamsfoundation.lams.tool.deploy.Deploy" classpathref="deploy.classpath" fork="true">
+			<arg file="${build.deploy}/deploy.xml" />
+			<arg value="True" />
+		</java>
+
+	</target>
+
+	<target name="deploy-tool" depends="create-deploy-package, run-deploy-package" description="Build the war, jar and run the deploy tool. Deletes most old tool references from db, creates db tables, application.xml in ear, copies war and jar file to ear. deploy-tool is only designed to be run in a development environment, or on an empty db. Do not run on a production environment.">
+	</target>
+
+	<target name="test-report" depends="compile.test">
+		<mkdir dir="${build.report}" />
+		<copy file="${conf.webinf.dir}/web.xml" todir="${testwebinf}" overwrite="true" />
+		<copy file="${conf.webinf.dir}/struts/struts-config.xml" todir="${testwebinf}" overwrite="true" />
+		<copy file="${conf.webinf.dir}/tiles/tiles-defs.xml" todir="${testwebinf}/tiles" overwrite="true" />
+		<copy overwrite="yes" todir="${build.classes.test}/org/lamsfoundation/lams/tool/qa/">
+			<fileset dir="${src.test.dir}/org/lamsfoundation/lams/tool/qa/">
+				<include name="*.xml" />
+				<include name="*.properties" />
+				<exclude name="web.xml" />
+			</fileset>
+		</copy>
+		<junit printsummary="yes" haltonerror="no" haltonfailure="no" fork="yes">
+			<formatter type="plain" usefile="false" />
+			<formatter type="xml" />
+			<batchtest todir="${build.report}">
+				<fileset dir="${src.test.dir}">
+					<include name="**/TestQaContent.java" />
+
 				</fileset>
-			</path> 
+			</batchtest>
+			<classpath>
+				<pathelement location="${build.classes.java}" />
+				<pathelement location="${build.classes.test}" />
+				<pathelement location="${hbm}" />
+				<pathelement location="${web}" />
+				<pathelement location="${webinf.spring}" />
+				<pathelement location="${testweb}" />
+				<path refid="project.classpath" />
+			</classpath>
+		</junit>
 
-			<echo>Deploying the QA tool</echo>
-	
-			<java
-				classname="org.lamsfoundation.lams.tool.deploy.Deploy"
-				classpathref="deploy.classpath"
-				fork="true">
-					<arg file="${build.deploy}/deploy.xml"/>
-					<arg value="True"/> 
-			</java>
-						
-		</target>
-		
-		<target name="deploy-tool" depends="create-deploy-package, run-deploy-package" 
-	   		description="Build the war, jar and run the deploy tool. Deletes most old tool references from db, creates db tables, application.xml in ear, copies war and jar file to ear. deploy-tool is only designed to be run in a development environment, or on an empty db. Do not run on a production environment.">
-		</target>
-	
-			<target name="test-report" depends="compile.test"> 
-				<mkdir dir="${build.report}"/>
-				<copy file="${conf.webinf.dir}/web.xml" todir="${testwebinf}" overwrite="true"/>		
-				<copy file="${conf.webinf.dir}/struts/struts-config.xml" todir="${testwebinf}" overwrite="true"/>			
-				<copy file="${conf.webinf.dir}/tiles/tiles-defs.xml" todir="${testwebinf}/tiles" overwrite="true"/>			
-				<copy overwrite="yes" todir="${build.classes.test}/org/lamsfoundation/lams/tool/qa/">
-								<fileset dir="${src.test.dir}/org/lamsfoundation/lams/tool/qa/">
-										<include name="*.xml"/>
-										<include name="*.properties"/>
-					   				    <exclude name="web.xml"/>
-								</fileset>
-				</copy>						
-				<junit printsummary="yes" haltonerror="no" haltonfailure="no"
-					   fork="yes">
-					<formatter type="plain" usefile="false"/>
-					<formatter type="xml"/>
-					<batchtest todir="${build.report}">
-						<fileset dir="${src.test.dir}">
-							<include name="**/TestQaContent.java"/>
+		<junitreport todir="${build.report}">
+			<fileset dir="${build.report}">
+				<include name="TEST-*.xml" />
+			</fileset>
+			<report todir="${build.report}/html" />
+		</junitreport>
 
-						</fileset>
-					</batchtest>
-					<classpath>
-						<pathelement location="${build.classes.java}"/>
-						<pathelement location="${build.classes.test}"/>
-						<pathelement location="${hbm}"/>
-						<pathelement location="${web}"/>
-						<pathelement location="${webinf.spring}"/>
-						<pathelement location="${testweb}"/>
-						<path refid="project.classpath"/>
-					</classpath>
-				</junit>
-				
-				<junitreport todir="${build.report}"> 
-					<fileset dir="${build.report}">
-						<include name="TEST-*.xml"/>
-					</fileset>
-					<report todir="${build.report}/html"/> 
-				</junitreport>
+	</target>
 
-			</target>
-	
-	   <!-- =================================  -->
-	   <!--       target: convert UTF-8 language files to Java properties files using native2ascii -->
-	   <!-- ================================= -->
-	    <target name="native2ascii" 
-	    	description="convert UTF-8 language files to Java properties files using native2ascii">
-			<native2ascii encoding="UTF-8" src="${conf.language.dir}" dest="${conf.language.dir}"
-			   includes="*.txt" ext=".properties"/>
-	    </target>
+	<!-- =================================  -->
+	<!--       target: convert UTF-8 language files to Java properties files using native2ascii -->
+	<!-- ================================= -->
+	<target name="native2ascii" description="convert UTF-8 language files to Java properties files using native2ascii">
+		<native2ascii encoding="UTF-8" src="${conf.language.dir}" dest="${conf.language.dir}" includes="*.txt" ext=".properties" />
+	</target>
 
-	   <!-- ================================= 
+	<!-- ================================= 
 	          target: synchronize-jsp              
 	         ================================= -->
-	    <target name="synchronize-deploy" description="copy non-java file into deploy folder">
-	        <copy verbose="yes" todir="${jboss.deploy}/${product}.war">
-	        	<fileset dir="${conf.web.dir}">
-	        		<include name="**/*.*"/>
-	        	</fileset>
-	        </copy>
-	    </target>
-	
-	<target name="explode-tool" depends="deploy-tool" description="explode tool jar and war package to a war folder">
+	<target name="synchronize-deploy" description="copy non-java file into deploy folder">
+		<copy verbose="yes" todir="${jboss.deploy}/${product}.war">
+			<fileset dir="${conf.web.dir}">
+				<include name="**/*.*" />
+			</fileset>
+		</copy>
+	</target>
+
+	<target name="explode-tool" depends="delete-exploded-tool-folder, deploy-tool" description="explode tool jar and war package to a war folder">
 		<!-- rename war file to avoid name conflict -->
 		<move tofile="${jboss.deploy}/temp-${product}.war" file="${jboss.deploy}/${product}.war" />
 		<!-- explode the ear -->
@@ -529,4 +479,52 @@
 		</delete>
 	</target>
 
+	<!-- =================================================================== -->
+	<!-- Generate hibernate xml files                             			 -->
+	<!-- =================================================================== -->
+	<target name="generate-wizard-hbm-files" description="Generate the hibernate hbm.xml files from the Java source (using XDoclet)">
+
+		<taskdef name="hibernatedoclet" classname="xdoclet.modules.hibernate.HibernateDocletTask" classpathref="all-libs" />
+
+		<echo message="Building hbm.xml files using XDoclet" />
+
+		<hibernatedoclet destdir="${conf.hibernate.mapping.dir}" excludedtags="@version,@author,@todo" force="true">
+			<fileset dir="${src.java.dir}">
+				<include name="**/QaWizard*.java" />
+				<include name="**/QaConfigItem.java" />
+			</fileset>
+			<hibernate version="3.0" />
+		</hibernatedoclet>
+	</target>
+
+	<!-- exports all the hbm mappings to the specified database -->
+	<target name="wizard-schemaexport" description="Exports all hbm.xml files in {conf.hibernate.mapping.dir}/hbm" depends="clean, generate-wizard-hbm-files">
+		<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">
+			<fileset dir="${conf.hibernate.mapping.dir}">
+				<include name="**/QaWizard*.hbm.xml" />
+				<include name="**/QaConfigItem.hbm.xml" />
+			</fileset>
+		</schemaexport>
+	</target>
+
+	<!-- =================================================================== -->
+	<!-- Deploy the gmap jar                          -->
+	<!-- =================================================================== -->
+	<target name="deploy-jar" depends="lams-laqa11-jar" description="Deploy the tool jar file">
+		<delete quiet="true">
+			<fileset dir="${jboss.deploy}/tmp" />
+			<fileset dir="${jboss.deploy}/work" />
+		</delete>
+		<copy file="${build.lib}/${product}.jar" todir="${jboss.deploy}" />
+		<copy overwrite="yes" todir="${jboss.deploy}/lams-dictionary.jar/org/lamsfoundation/lams/tool/qa">
+			<fileset dir="${conf.language.dir}">
+				<include name="**/*.properties" />
+				<include name="**/*.txt" />
+			</fileset>
+		</copy>
+	</target>
+
 </project>
\ No newline at end of file
Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaConfigItem.hbm.xml
===================================================================
diff -u
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaConfigItem.hbm.xml	(revision 0)
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaConfigItem.hbm.xml	(revision 80a367726b9e7607851be28429bda54d9b306159)
@@ -0,0 +1,57 @@
+<?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.tool.qa.QaConfigItem"
+        table="tl_laqa11_configuration"
+    >
+
+        <id
+            name="uid"
+            column="uid"
+            type="java.lang.Long"
+        >
+            <generator class="native">
+              <!--  
+                  To add non XDoclet generator parameters, create a file named 
+                  hibernate-generator-params-QaConfigItem.xml 
+                  containing the additional parameters and place it in your merge dir. 
+              --> 
+            </generator>
+        </id>
+
+        <property
+            name="configKey"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="config_key"
+            length="30"
+            not-null="false"
+            unique="true"
+        />
+
+        <property
+            name="configValue"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="config_value"
+            length="255"
+            not-null="false"
+        />
+
+        <!--
+            To add non XDoclet property mappings, create a file named
+                hibernate-properties-QaConfigItem.xml
+            containing the additional properties and place it in your merge dir.
+        -->
+
+    </class>
+
+</hibernate-mapping>
Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaWizardCategory.hbm.xml
===================================================================
diff -u
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaWizardCategory.hbm.xml	(revision 0)
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaWizardCategory.hbm.xml	(revision 80a367726b9e7607851be28429bda54d9b306159)
@@ -0,0 +1,65 @@
+<?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.tool.qa.QaWizardCategory"
+        table="tl_laqa11_wizard_category"
+    >
+
+        <id
+            name="uid"
+            column="uid"
+            type="java.lang.Long"
+        >
+            <generator class="native">
+              <!--  
+                  To add non XDoclet generator parameters, create a file named 
+                  hibernate-generator-params-QaWizardCategory.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"
+        />
+
+        <set
+            name="cognitiveSkills"
+            lazy="true"
+            inverse="false"
+            cascade="all-delete-orphan"
+            sort="unsorted"
+        >
+
+            <key
+                column="category_uid"
+            >
+            </key>
+
+            <one-to-many
+                  class="org.lamsfoundation.lams.tool.qa.QaWizardCognitiveSkill"
+            />
+
+        </set>
+
+        <!--
+            To add non XDoclet property mappings, create a file named
+                hibernate-properties-QaWizardCategory.xml
+            containing the additional properties and place it in your merge dir.
+        -->
+
+    </class>
+
+</hibernate-mapping>
Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaWizardCognitiveSkill.hbm.xml
===================================================================
diff -u
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaWizardCognitiveSkill.hbm.xml	(revision 0)
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaWizardCognitiveSkill.hbm.xml	(revision 80a367726b9e7607851be28429bda54d9b306159)
@@ -0,0 +1,76 @@
+<?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.tool.qa.QaWizardCognitiveSkill"
+        table="tl_laqa11_wizard_cognitive_skill"
+    >
+
+        <id
+            name="uid"
+            column="uid"
+            type="java.lang.Long"
+        >
+            <generator class="native">
+              <!--  
+                  To add non XDoclet generator parameters, create a file named 
+                  hibernate-generator-params-QaWizardCognitiveSkill.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"
+        />
+
+        <many-to-one
+            name="category"
+            class="org.lamsfoundation.lams.tool.qa.QaWizardCategory"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+            column="category_uid"
+        />
+
+        <set
+            name="questions"
+            lazy="true"
+            inverse="false"
+            cascade="all-delete-orphan"
+            sort="unsorted"
+            order-by="uid asc"
+        >
+
+            <key
+                column="cognitive_skill_uid"
+            >
+            </key>
+
+            <one-to-many
+                  class="org.lamsfoundation.lams.tool.qa.QaWizardQuestion"
+            />
+
+        </set>
+
+        <!--
+            To add non XDoclet property mappings, create a file named
+                hibernate-properties-QaWizardCognitiveSkill.xml
+            containing the additional properties and place it in your merge dir.
+        -->
+
+    </class>
+
+</hibernate-mapping>
Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaWizardQuestion.hbm.xml
===================================================================
diff -u
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaWizardQuestion.hbm.xml	(revision 0)
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaWizardQuestion.hbm.xml	(revision 80a367726b9e7607851be28429bda54d9b306159)
@@ -0,0 +1,56 @@
+<?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.tool.qa.QaWizardQuestion"
+        table="tl_laqa11_wizard_question"
+    >
+
+        <id
+            name="uid"
+            column="uid"
+            type="java.lang.Long"
+        >
+            <generator class="native">
+              <!--  
+                  To add non XDoclet generator parameters, create a file named 
+                  hibernate-generator-params-QaWizardQuestion.xml 
+                  containing the additional parameters and place it in your merge dir. 
+              --> 
+            </generator>
+        </id>
+
+        <many-to-one
+            name="cognitiveSkill"
+            class="org.lamsfoundation.lams.tool.qa.QaWizardCognitiveSkill"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+            column="cognitive_skill_uid"
+        />
+
+        <property
+            name="question"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="title"
+            length="1027"
+            not-null="true"
+        />
+
+        <!--
+            To add non XDoclet property mappings, create a file named
+                hibernate-properties-QaWizardQuestion.xml
+            containing the additional properties and place it in your merge dir.
+        -->
+
+    </class>
+
+</hibernate-mapping>
Index: lams_tool_laqa/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rf34556c36d04199043d3fd6beec4034208951c2f -r80a367726b9e7607851be28429bda54d9b306159
--- lams_tool_laqa/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision f34556c36d04199043d3fd6beec4034208951c2f)
+++ lams_tool_laqa/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 80a367726b9e7607851be28429bda54d9b306159)
@@ -199,6 +199,38 @@
 textsearch.any.words  =have one or more of these words:
 textsearch.excluded.words  =have none of these unwanted words:
 textsearch.questions  =Search in these questions:
+pageTitle.admin  =Q&A Configuration
+admin.formError  =Missing values, please make sure all required fields are entered.
+admin.enableWizard  =Enable the Q&A question wizard
+admin.success  =Configuration successfully saved.
+admin.return  =Return to maintain LAMS
+wizard.ok  =OK
+wizard.wizardTitle  =Cognitive Skills Wizard
+wizard.selectCategory  =Select category
+wizard.selectSkill  =Select cognitive skill
+wizard.selectQuestion  =Select question
+wizard.add  =Add
+wizard.addCategory =Add Category
+wizard.addSkill =Add Cognitive Skill
+wizard.addQuestion =Add Question
+wizard.add.mustSelectCategory  =You must select a category before adding a cognitive skill.
+wizard.add.mustSelectSkill  =You must select a cognitive skill and a category before adding a question.
+wizard.edit  =Edit
+wizard.editCategory =Edit Category
+wizard.edit.notSelected  =Please select the corresponding category, cognitive skill or question before clicking edit.
+wizard.delete  =Delete
+wizard.delete.warnDeleteCategory  =Deleting this category will delete also all its cognitive skills and questions, this cannot be undone. Do you wish to continue?
+wizard.delete.warnDeleteSkill  =Deleting this cognitive skill will also delete all its questions, this cannot be undone. Do you wish to continue?
+wizard.delete.warnDeleteQuestion  =Are you sure you want to delete this question? This cannot be undone.
+wizard.delete.category  =Category successfully deleted.
+wizard.delete.skill  =Cognitive skill successfully deleted.
+wizard.delete.question  =Question successfully deleted.
+wizard.delete.notselected  =Please select an item to delete first.
+wizard.author.wizardTitle  =Cognitive Skills Wizard
+wizard.author.info1  = This wizard helps you choose the right type of question you might want to ask your learners. 
+wizard.author.info2  = Choose a category and then the second menu will display the cognitive skill. 
+wizard.author.info3  = After you select a cognitive skill, you'll be presented with a question template you can use.
 
 
+
 #======= End labels: Exported 193 labels for en AU =====
Index: lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -rf34556c36d04199043d3fd6beec4034208951c2f -r80a367726b9e7607851be28429bda54d9b306159
--- lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision f34556c36d04199043d3fd6beec4034208951c2f)
+++ lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 80a367726b9e7607851be28429bda54d9b306159)
@@ -201,4 +201,43 @@
 textsearch.questions  =Search in these questions:
 
 
-#======= End labels: Exported 193 labels for en AU =====
+textsearch.heading =Answers that...
+textsearch.all.words =have all these words:
+textsearch.phrase =have this exact wording or phrase:
+textsearch.any.words =have one or more of these words:
+textsearch.excluded.words =have none of these unwanted words:
+textsearch.questions =Search in these questions:
+
+pageTitle.admin  =Q&A Configuration
+admin.formError  =Missing values, please make sure all required fields are entered.
+admin.enableWizard  =Enable the Q&A question wizard
+admin.success  =Configuration successfully saved.
+admin.return  =Return to maintain LAMS
+wizard.ok  =OK
+wizard.wizardTitle  =Cognitive Skills Wizard
+wizard.selectCategory  =Select category
+wizard.selectSkill  =Select cognitive skill
+wizard.selectQuestion  =Select question
+wizard.add  =Add
+wizard.addCategory =Add Category
+wizard.addSkill =Add Cognitive Skill
+wizard.addQuestion =Add Question
+wizard.add.mustSelectCategory  =You must select a category before adding a cognitive skill.
+wizard.add.mustSelectSkill  =You must select a cognitive skill and a category before adding a question.
+wizard.edit  =Edit
+wizard.editCategory =Edit Category
+wizard.edit.notSelected  =Please select the corresponding category, cognitive skill or question before clicking edit.
+wizard.delete  =Delete
+wizard.delete.warnDeleteCategory  =Deleting this category will delete also all its cognitive skills and questions, this cannot be undone. Do you wish to continue?
+wizard.delete.warnDeleteSkill  =Deleting this cognitive skill will also delete all its questions, this cannot be undone. Do you wish to continue?
+wizard.delete.warnDeleteQuestion  =Are you sure you want to delete this question? This cannot be undone.
+wizard.delete.category  =Category successfully deleted.
+wizard.delete.skill  =Cognitive skill successfully deleted.
+wizard.delete.question  =Question successfully deleted.
+wizard.delete.notselected  =Please select an item to delete first.
+wizard.author.wizardTitle  =Cognitive Skills Wizard
+wizard.author.info1  = This wizard helps you choose the right type of question you might want to ask your learners. 
+wizard.author.info2  = Choose a category and then the second menu will display the cognitive skill. 
+wizard.author.info3  = After you select a cognitive skill, you'll be presented with a question template you can use.
+
+#======= End labels: Exported 168 labels for en AU =====
Index: lams_tool_laqa/conf/language/rams/ApplicationResources.properties
===================================================================
diff -u -re58357098773303e96bea0f5f82f9b03c2bcc770 -r80a367726b9e7607851be28429bda54d9b306159
--- lams_tool_laqa/conf/language/rams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision e58357098773303e96bea0f5f82f9b03c2bcc770)
+++ lams_tool_laqa/conf/language/rams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 80a367726b9e7607851be28429bda54d9b306159)
@@ -171,5 +171,38 @@
 errors.maxfilesize  =The uploaded file has exceeded the maximum file size limit of {0} bytes
 warning.empty.answers  =One or more question(s) are not answered. Do you want to continue anyway?
 
+pageTitle.admin  =Q&A Configuration
+admin.formError  =Missing values, please make sure all required fields are entered.
+admin.enableWizard  =Enable the Q&A question wizard
+admin.success  =Configuration successfully saved.
+admin.return  =Return to maintain LAMS
+wizard.ok  =OK
+wizard.wizardTitle  =Cognitive Skills Wizard
+wizard.selectCategory  =Select category
+wizard.selectSkill  =Select cognitive skill
+wizard.selectQuestion  =Select question
+wizard.add  =Add
+wizard.addCategory =Add Category
+wizard.addSkill =Add Cognitive Skill
+wizard.addQuestion =Add Question
+wizard.add.mustSelectCategory  =You must select a category before adding a cognitive skill.
+wizard.add.mustSelectSkill  =You must select a cognitive skill and a category before adding a question.
+wizard.edit  =Edit
+wizard.editCategory =Edit Category
+wizard.edit.notSelected  =Please select the corresponding category, cognitive skill or question before clicking edit.
+wizard.delete  =Delete
+wizard.delete.warnDeleteCategory  =Deleting this category will delete also all its cognitive skills and questions, this cannot be undone. Do you wish to continue?
+wizard.delete.warnDeleteSkill  =Deleting this cognitive skill will also delete all its questions, this cannot be undone. Do you wish to continue?
+wizard.delete.warnDeleteQuestion  =Are you sure you want to delete this question? This cannot be undone.
+wizard.delete.category  =Category successfully deleted.
+wizard.delete.skill  =Cognitive skill successfully deleted.
+wizard.delete.question  =Question successfully deleted.
+wizard.delete.notselected  =Please select an item to delete first.
+wizard.author.wizardTitle  =Cognitive Skills Wizard
+wizard.author.info1  = This wizard helps you choose the right type of question you might want to ask your learners. 
+wizard.author.info2  = Choose a category and then the second menu will display the cognitive skill. 
+wizard.author.info3  = After you select a cognitive skill, you'll be presented with a question template you can use.
 
+
+
 #======= End labels: Exported 164 labels for en AU =====
Index: lams_tool_laqa/conf/language/rams/ApplicationResources_en_AU.properties
===================================================================
diff -u -re58357098773303e96bea0f5f82f9b03c2bcc770 -r80a367726b9e7607851be28429bda54d9b306159
--- lams_tool_laqa/conf/language/rams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision e58357098773303e96bea0f5f82f9b03c2bcc770)
+++ lams_tool_laqa/conf/language/rams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 80a367726b9e7607851be28429bda54d9b306159)
@@ -171,5 +171,38 @@
 errors.maxfilesize  =The uploaded file has exceeded the maximum file size limit of {0} bytes
 warning.empty.answers  =One or more question(s) are not answered. Do you want to continue anyway?
 
+pageTitle.admin  =Q&A Configuration
+admin.formError  =Missing values, please make sure all required fields are entered.
+admin.enableWizard  =Enable the Q&A question wizard
+admin.success  =Configuration successfully saved.
+admin.return  =Return to maintain LAMS
+wizard.ok  =OK
+wizard.wizardTitle  =Cognitive Skills Wizard
+wizard.selectCategory  =Select category
+wizard.selectSkill  =Select cognitive skill
+wizard.selectQuestion  =Select question
+wizard.add  =Add
+wizard.addCategory =Add Category
+wizard.addSkill =Add Cognitive Skill
+wizard.addQuestion =Add Question
+wizard.add.mustSelectCategory  =You must select a category before adding a cognitive skill.
+wizard.add.mustSelectSkill  =You must select a cognitive skill and a category before adding a question.
+wizard.edit  =Edit
+wizard.editCategory =Edit Category
+wizard.edit.notSelected  =Please select the corresponding category, cognitive skill or question before clicking edit.
+wizard.delete  =Delete
+wizard.delete.warnDeleteCategory  =Deleting this category will delete also all its cognitive skills and questions, this cannot be undone. Do you wish to continue?
+wizard.delete.warnDeleteSkill  =Deleting this cognitive skill will also delete all its questions, this cannot be undone. Do you wish to continue?
+wizard.delete.warnDeleteQuestion  =Are you sure you want to delete this question? This cannot be undone.
+wizard.delete.category  =Category successfully deleted.
+wizard.delete.skill  =Cognitive skill successfully deleted.
+wizard.delete.question  =Question successfully deleted.
+wizard.delete.notselected  =Please select an item to delete first.
+wizard.author.wizardTitle  =Cognitive Skills Wizard
+wizard.author.info1  = This wizard helps you choose the right type of question you might want to ask your learners. 
+wizard.author.info2  = Choose a category and then the second menu will display the cognitive skill. 
+wizard.author.info3  = After you select a cognitive skill, you'll be presented with a question template you can use.
 
+
+
 #======= End labels: Exported 164 labels for en AU =====
Index: lams_tool_laqa/db/sql/create_lams_tool_qa.sql
===================================================================
diff -u -r33f9171c071c179459972380a9b732f1aeec87bf -r80a367726b9e7607851be28429bda54d9b306159
--- lams_tool_laqa/db/sql/create_lams_tool_qa.sql	(.../create_lams_tool_qa.sql)	(revision 33f9171c071c179459972380a9b732f1aeec87bf)
+++ lams_tool_laqa/db/sql/create_lams_tool_qa.sql	(.../create_lams_tool_qa.sql)	(revision 80a367726b9e7607851be28429bda54d9b306159)
@@ -116,3 +116,29 @@
 
 -- data for content questions table
 INSERT INTO tl_laqa11_que_content (question, display_order, qa_content_id) VALUES ('Sample Question 1?',1,1);
+
+SET FOREIGN_KEY_CHECKS=0;
+-- insert scripts for the wizard tables
+drop table if exists tl_laqa11_configuration;
+drop table if exists tl_laqa11_wizard_category;
+drop table if exists tl_laqa11_wizard_cognitive_skill;
+drop table if exists tl_laqa11_wizard_question;
+create table tl_laqa11_configuration (uid bigint not null auto_increment, config_key varchar(30) unique, config_value varchar(255), primary key (uid))TYPE=InnoDB;
+create table tl_laqa11_wizard_category (uid bigint not null auto_increment, title varchar(255) not null, primary key (uid))TYPE=InnoDB;
+create table tl_laqa11_wizard_cognitive_skill (uid bigint not null auto_increment, title varchar(255) not null, category_uid bigint, primary key (uid))TYPE=InnoDB;
+create table tl_laqa11_wizard_question (uid bigint not null auto_increment, cognitive_skill_uid bigint, title text not null, primary key (uid))TYPE=InnoDB;
+alter table tl_laqa11_wizard_cognitive_skill add index FK3BA4132BCBB0DC8D (category_uid), add constraint FK3BA4132BCBB0DC8D foreign key (category_uid) references tl_laqa11_wizard_category (uid);
+alter table tl_laqa11_wizard_question add index FKAF08A0C7EFF77FD4 (cognitive_skill_uid), add constraint FKAF08A0C7EFF77FD4 foreign key (cognitive_skill_uid) references tl_laqa11_wizard_cognitive_skill (uid);
+
+-- Inserting the required config item into the config table
+-- Gmap API key is added here for shaun so the Gmap works there automatically for each build
+INSERT INTO tl_laqa11_configuration (
+	config_key, 
+	config_value
+)
+VALUES(
+	"enableQaWizard",
+	"false"
+);
+SET FOREIGN_KEY_CHECKS=1;
+
Index: lams_tool_laqa/db/sql/tool_insert.sql
===================================================================
diff -u -r0af4ed13b963a588f3499b080801863d57f8ad95 -r80a367726b9e7607851be28429bda54d9b306159
--- lams_tool_laqa/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 0af4ed13b963a588f3499b080801863d57f8ad95)
+++ lams_tool_laqa/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 80a367726b9e7607851be28429bda54d9b306159)
@@ -50,7 +50,8 @@
 context_file,
 create_date_time,
 modified_date_time,
-supports_outputs
+supports_outputs,
+admin_url
 )
 VALUES
 (
@@ -81,5 +82,6 @@
 '/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml',
 NOW(),
 NOW(),
-1
+1,
+'tool/laqa11/laqa11admin.do'
 )
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
===================================================================
diff -u -r33f9171c071c179459972380a9b732f1aeec87bf -r80a367726b9e7607851be28429bda54d9b306159
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	(.../QaAppConstants.java)	(revision 33f9171c071c179459972380a9b732f1aeec87bf)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	(.../QaAppConstants.java)	(revision 80a367726b9e7607851be28429bda54d9b306159)
@@ -281,4 +281,6 @@
     public static final int QUESTION_CUTOFF_INDEX = 40;
     public static final String TEXT_SEARCH_DEFINITION_NAME = "text.search.output.definition.qa";
     public static final String TEXT_SEARCH_DEFAULT_CONDITION_DISPLAY_NAME_KEY = "text.search.output.definition.qa.default.condition";
+    public static final String ATTR_WIZARD_CATEGORIES = "wizardCategories";
+    public static final String ATTR_WIZARD_ENABLED = "wizardEnabled";
 }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaConfigItem.java
===================================================================
diff -u
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaConfigItem.java	(revision 0)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaConfigItem.java	(revision 80a367726b9e7607851be28429bda54d9b306159)
@@ -0,0 +1,81 @@
+/****************************************************************
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $Id$ */
+package org.lamsfoundation.lams.tool.qa;
+
+/**
+ * @hibernate.class table="tl_laqa11_configuration"
+ */
+public class QaConfigItem {
+
+    public static final String KEY_ENABLE_QAWIZARD = "enableQaWizard";
+
+    private Long uid;
+    private String configKey;
+    private String configValue;
+
+    public QaConfigItem() {
+    }
+
+    public QaConfigItem(Long uid, String configKey, String configValue) {
+	super();
+	this.uid = uid;
+	this.configKey = configKey;
+	this.configValue = configValue;
+    }
+
+    /**
+     * @hibernate.id generator-class="native" type="java.lang.Long" column="uid"
+     * 
+     */
+    public Long getUid() {
+	return uid;
+    }
+
+    public void setUid(Long uid) {
+	this.uid = uid;
+    }
+
+    /**
+     * @hibernate.property column="config_key" length="30" not-null="false"
+     *                     unique="true"
+     */
+    public String getConfigKey() {
+	return configKey;
+    }
+
+    public void setConfigKey(String configKey) {
+	this.configKey = configKey;
+    }
+
+    /**
+     * @hibernate.property column="config_value" length="255" not-null="false"
+     */
+    public String getConfigValue() {
+	return configValue;
+    }
+
+    public void setConfigValue(String configValue) {
+	this.configValue = configValue;
+    }
+}
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaWizardCategory.java
===================================================================
diff -u
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaWizardCategory.java	(revision 0)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaWizardCategory.java	(revision 80a367726b9e7607851be28429bda54d9b306159)
@@ -0,0 +1,101 @@
+/****************************************************************
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */ 
+ 
+/* $Id$ */ 
+package org.lamsfoundation.lams.tool.qa;
+
+import java.io.Serializable;
+import java.util.Set;
+
+/**
+ * This class maps to a single category in the q&a wizard, it
+ * contains a set of cognitive skills
+ * 
+ * @hibernate.class table="tl_laqa11_wizard_category"
+ */ 
+public class QaWizardCategory implements Serializable, Comparable<QaWizardCategory> {
+    
+    public static final long serialVersionUID = 1234165196523665452L;
+    
+    private Long uid;
+    private String title;
+    private Set<QaWizardCognitiveSkill> cognitiveSkills;
+    
+    public QaWizardCategory() {
+    }
+
+    public QaWizardCategory(Long uid, String title, Set<QaWizardCognitiveSkill> cognitiveSkills) {
+	super();
+	this.uid = uid;
+	this.title = title;
+	this.cognitiveSkills = cognitiveSkills;
+    }
+
+    /**
+     * @hibernate.id generator-class="native" type="java.lang.Long" column="uid"
+     * 
+     */
+    public Long getUid() {
+        return uid;
+    }
+
+    public void setUid(Long uid) {
+        this.uid = uid;
+    }
+
+    /**
+     * @hibernate.property column="title" length="255" not-null="true"
+     */
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    /**
+     * @hibernate.set lazy="true" inverse="false" cascade="all-delete-orphan"
+     * @hibernate.collection-key column="category_uid"
+     * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.qa.QaWizardCognitiveSkill"
+     * 
+     */
+    public Set<QaWizardCognitiveSkill> getCognitiveSkills() {
+        return cognitiveSkills;
+    }
+
+    public void setCognitiveSkills(Set<QaWizardCognitiveSkill> cognitiveSkills) {
+        this.cognitiveSkills = cognitiveSkills;
+    }
+    
+    public int compareTo(QaWizardCategory category) {
+	if (category.getUid()!=null && uid != null)
+	{
+	    return category.getUid().compareTo(uid) * -1;
+	}
+	else
+	{
+	    return 1;
+	}
+    }
+}
+ 
\ No newline at end of file
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaWizardCognitiveSkill.java
===================================================================
diff -u
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaWizardCognitiveSkill.java	(revision 0)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaWizardCognitiveSkill.java	(revision 80a367726b9e7607851be28429bda54d9b306159)
@@ -0,0 +1,120 @@
+/****************************************************************
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */ 
+ 
+/* $Id$ */ 
+package org.lamsfoundation.lams.tool.qa;
+
+import java.io.Serializable;
+import java.util.Set;
+import java.util.SortedSet;
+
+/**
+ * This class maps to a single cognitive skill in the q&a wizard, it 
+ * contains a set of questions
+ * 
+ * @hibernate.class table="tl_laqa11_wizard_cognitive_skill"
+ */ 
+public class QaWizardCognitiveSkill implements Serializable, Comparable<QaWizardCognitiveSkill> {
+    
+    public static final long serialVersionUID = 6732784345784895744L;
+    
+    private Long uid;
+    private String title;
+    private QaWizardCategory category;
+    private Set<QaWizardQuestion> questions;
+    
+    public QaWizardCognitiveSkill() {
+    }
+
+    public QaWizardCognitiveSkill(Long uid, String title, QaWizardCategory category, SortedSet<QaWizardQuestion> questions) {
+	super();
+	this.uid = uid;
+	this.title = title;
+	this.category = category;
+	this.questions = questions;
+    }
+
+    /**
+     * @hibernate.id generator-class="native" type="java.lang.Long" column="uid"
+     * 
+     */
+    public Long getUid() {
+        return uid;
+    }
+
+    public void setUid(Long uid) {
+        this.uid = uid;
+    }
+
+    /**
+     * @hibernate.property column="title" length="255" not-null="true"
+     */
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    /**
+     * 
+     * @hibernate.many-to-one cascade="none"
+     * 		class="org.lamsfoundation.lams.tool.qa.QaWizardCategory"
+     *          column="category_uid"
+     * 
+     */
+    public QaWizardCategory getCategory() {
+        return category;
+    }
+
+    public void setCategory(QaWizardCategory category) {
+        this.category = category;
+    }
+
+    /**
+     * @hibernate.set lazy="true" inverse="false" cascade="all-delete-orphan"
+     *                order-by="uid asc"
+     * @hibernate.collection-key column="cognitive_skill_uid"
+     * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.qa.QaWizardQuestion"
+     * 
+     */
+    public Set<QaWizardQuestion> getQuestions() {
+        return questions;
+    }
+
+    public void setQuestions(Set<QaWizardQuestion> questions) {
+        this.questions = questions;
+    }
+    
+    public int compareTo(QaWizardCognitiveSkill skill) {
+	if (skill.getUid()!=null && uid != null)
+	{
+	    return skill.getUid().compareTo(uid) * -1;
+	}
+	else
+	{
+	    return 1;
+	}
+    }
+}
+ 
\ No newline at end of file
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaWizardQuestion.java
===================================================================
diff -u
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaWizardQuestion.java	(revision 0)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaWizardQuestion.java	(revision 80a367726b9e7607851be28429bda54d9b306159)
@@ -0,0 +1,102 @@
+/****************************************************************
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */ 
+ 
+/* $Id$ */ 
+package org.lamsfoundation.lams.tool.qa;
+
+import java.io.Serializable;
+
+/**
+ * This class maps to a sample question in the q&a wizard, it has a parent 
+ * cognitive skill which in turn has a parent category
+ * 
+ * @hibernate.class table="tl_laqa11_wizard_question"
+ */ 
+public class QaWizardQuestion implements Serializable, Comparable<QaWizardQuestion>{
+
+    public static final long serialVersionUID = 4353787904539453783L;
+    
+    private Long uid;
+    private QaWizardCognitiveSkill cognitiveSkill;
+    private String question;
+    
+    public QaWizardQuestion() {
+    }
+
+    public QaWizardQuestion(Long uid, QaWizardCognitiveSkill cognitiveSkill, String question) {
+	super();
+	this.uid = uid;
+	this.cognitiveSkill = cognitiveSkill;
+	this.question = question;
+    }
+
+    /**
+     * @hibernate.id generator-class="native" type="java.lang.Long" column="uid"
+     * 
+     */
+    public Long getUid() {
+        return uid;
+    }
+
+    public void setUid(Long uid) {
+        this.uid = uid;
+    }
+
+    /**
+     * 
+     * @hibernate.many-to-one cascade="none"
+     * 		class="org.lamsfoundation.lams.tool.qa.QaWizardCognitiveSkill"
+     *          column="cognitive_skill_uid"
+     * 
+     */
+    public QaWizardCognitiveSkill getCognitiveSkill() {
+        return cognitiveSkill;
+    }
+
+    public void setCognitiveSkill(QaWizardCognitiveSkill cognitiveSkill) {
+        this.cognitiveSkill = cognitiveSkill;
+    }
+
+    /**
+     * @hibernate.property column="title" length="1027" not-null="true"
+     */
+    public String getQuestion() {
+        return question;
+    }
+
+    public void setQuestion(String question) {
+        this.question = question;
+    }
+    
+    public int compareTo(QaWizardQuestion question) {
+	if (question.getUid() != null && uid != null)
+	{
+	    return question.getUid().compareTo(uid) * -1;
+	}
+	else
+	{
+	    return 1;
+	}
+    }
+    
+}
+ 
\ No newline at end of file
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaConfigItemDAO.java
===================================================================
diff -u
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaConfigItemDAO.java	(revision 0)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaConfigItemDAO.java	(revision 80a367726b9e7607851be28429bda54d9b306159)
@@ -0,0 +1,34 @@
+/****************************************************************
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $Id$ */
+package org.lamsfoundation.lams.tool.qa.dao;
+
+import org.lamsfoundation.lams.dao.IBaseDAO;
+import org.lamsfoundation.lams.tool.qa.QaConfigItem;
+
+public interface IQaConfigItemDAO extends IBaseDAO {
+
+    public void saveOrUpdate(QaConfigItem toConfig);
+
+    public QaConfigItem getConfigItemByKey(final String configKey);
+}
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaWizardDAO.java
===================================================================
diff -u
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaWizardDAO.java	(revision 0)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaWizardDAO.java	(revision 80a367726b9e7607851be28429bda54d9b306159)
@@ -0,0 +1,39 @@
+/****************************************************************
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */ 
+ 
+/* $Id$ */ 
+package org.lamsfoundation.lams.tool.qa.dao; 
+
+import java.util.SortedSet;
+
+import org.lamsfoundation.lams.dao.IBaseDAO;
+import org.lamsfoundation.lams.tool.qa.QaWizardCategory;
+import org.lamsfoundation.lams.tool.qa.QaWizardCognitiveSkill;
+import org.lamsfoundation.lams.tool.qa.QaWizardQuestion;
+public interface IQaWizardDAO extends IBaseDAO{
+    void saveOrUpdateCategories(SortedSet<QaWizardCategory> categories);
+    SortedSet<QaWizardCategory> getWizardCategories();
+    void deleteWizardCategoryByUID(Long uid);
+    void deleteWizardSkillByUID(Long uid);
+    void deleteWizardQuestionByUID(Long uid);
+}
+ 
\ No newline at end of file
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaConfigItemDAO.java
===================================================================
diff -u
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaConfigItemDAO.java	(revision 0)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaConfigItemDAO.java	(revision 80a367726b9e7607851be28429bda54d9b306159)
@@ -0,0 +1,52 @@
+/****************************************************************
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $Id$ */
+package org.lamsfoundation.lams.tool.qa.dao.hibernate;
+
+import org.hibernate.HibernateException;
+import org.hibernate.Session;
+import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
+import org.lamsfoundation.lams.tool.qa.dao.IQaConfigItemDAO;
+import org.lamsfoundation.lams.tool.qa.QaConfigItem;
+import org.springframework.orm.hibernate3.HibernateCallback;
+
+public class QaConfigItemDAO extends BaseDAO implements IQaConfigItemDAO {
+
+    private static final String LOAD_CONFIG_ITEM_BY_KEY = "from QaConfigItem configuration"
+	    + " where configuration.configKey=:key";
+
+    public QaConfigItem getConfigItemByKey(final String configKey) {
+	return (QaConfigItem) getHibernateTemplate().execute(new HibernateCallback() {
+	    public Object doInHibernate(Session session) throws HibernateException {
+		return session.createQuery(LOAD_CONFIG_ITEM_BY_KEY).setString("key", configKey).uniqueResult();
+	    }
+	});
+
+    }
+
+    public void saveOrUpdate(QaConfigItem qaConfigItem) {
+	this.getHibernateTemplate().saveOrUpdate(qaConfigItem);
+	this.getHibernateTemplate().flush();
+    }
+
+}
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaWizardDAO.java
===================================================================
diff -u
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaWizardDAO.java	(revision 0)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaWizardDAO.java	(revision 80a367726b9e7607851be28429bda54d9b306159)
@@ -0,0 +1,127 @@
+/****************************************************************
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $Id$ */
+package org.lamsfoundation.lams.tool.qa.dao.hibernate;
+
+import java.util.List;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
+import org.lamsfoundation.lams.tool.qa.QaWizardCategory;
+import org.lamsfoundation.lams.tool.qa.QaWizardCognitiveSkill;
+import org.lamsfoundation.lams.tool.qa.QaWizardQuestion;
+import org.lamsfoundation.lams.tool.qa.dao.IQaWizardDAO;
+
+/**
+ * 
+ * @author lfoxton
+ * 
+ */
+public class QaWizardDAO extends BaseDAO implements IQaWizardDAO {
+
+    private static final String QUERY_FIND_ALL_CATEGORIES = "from " + QaWizardCategory.class.getName();
+    
+    private static final String QUERY_GET_CATEGORY = "from " + QaWizardCategory.class.getName() + " c where c.uid=?";
+    private static final String QUERY_GET_SKILL = "from " + QaWizardCognitiveSkill.class.getName() + " c where c.uid=?";
+    private static final String QUERY_GET_QUESTION = "from " + QaWizardQuestion.class.getName() + " q where q.uid=?";
+    
+    public void saveOrUpdateCategories(SortedSet<QaWizardCategory> categories) {
+	getHibernateTemplate().saveOrUpdateAll(categories);
+    }
+
+    @SuppressWarnings("unchecked")
+    public SortedSet<QaWizardCategory> getWizardCategories() {
+	SortedSet<QaWizardCategory> ret = new TreeSet<QaWizardCategory>();
+	List<QaWizardCategory> list = getHibernateTemplate().find(QUERY_FIND_ALL_CATEGORIES);
+	for (QaWizardCategory category : list) {
+	    ret.add(category);
+	}
+	return ret;
+    }
+
+    public void deleteWizardCategoryByUID(Long uid) {
+	QaWizardCategory cat = getWizardCategoryByUID(uid);
+	if (cat != null)
+	{
+	    getHibernateTemplate().delete(cat);
+	}
+    }
+
+    public void deleteWizardSkillByUID(Long uid){
+	QaWizardCognitiveSkill skill = getWizardSkillByUID(uid);
+	if (skill != null)
+	{
+	    getHibernateTemplate().delete(skill);
+	}
+    }
+    
+    public void deleteWizardQuestionByUID(Long uid){
+	QaWizardQuestion question = getWizardQuestionByUID(uid);
+	if (question != null)
+	{
+	    getHibernateTemplate().delete(question);
+	}
+    }
+
+    @SuppressWarnings("unchecked")
+    public QaWizardCategory getWizardCategoryByUID(Long uid) {
+	List result = getHibernateTemplate().find(QUERY_GET_CATEGORY, uid);
+	if (result.size() > 0)
+	{
+	    return (QaWizardCategory)result.get(0);
+	}
+	else
+	{
+	    return null;
+	}
+    }
+
+    @SuppressWarnings("unchecked")
+    public QaWizardCognitiveSkill getWizardSkillByUID(Long uid){
+	List result = getHibernateTemplate().find(QUERY_GET_SKILL, uid);
+	if (result.size() > 0)
+	{
+	    return (QaWizardCognitiveSkill)result.get(0);
+	}
+	else
+	{
+	    return null;
+	}
+    }
+    
+    @SuppressWarnings("unchecked")
+    public QaWizardQuestion getWizardQuestionByUID(Long uid){
+	
+	List result = getHibernateTemplate().find(QUERY_GET_QUESTION, uid);
+	if (result.size() > 0)
+	{
+	    return (QaWizardQuestion)result.get(0);
+	}
+	else
+	{
+	    return null;
+	}
+    }
+
+}
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
===================================================================
diff -u -r0af4ed13b963a588f3499b080801863d57f8ad95 -r80a367726b9e7607851be28429bda54d9b306159
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml	(.../qaApplicationContext.xml)	(revision 0af4ed13b963a588f3499b080801863d57f8ad95)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml	(.../qaApplicationContext.xml)	(revision 80a367726b9e7607851be28429bda54d9b306159)
@@ -32,6 +32,10 @@
 				<value>/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml</value>
 				<value>/org/lamsfoundation/lams/tool/qa/QaUploadedFile.hbm.xml</value>
 				<value>/org/lamsfoundation/lams/tool/qa/QaCondition.hbm.xml</value>
+				<value>/org/lamsfoundation/lams/tool/qa/QaConfigItem.hbm.xml</value>
+				<value>/org/lamsfoundation/lams/tool/qa/QaWizardCognitiveSkill.hbm.xml</value>
+				<value>/org/lamsfoundation/lams/tool/qa/QaWizardQuestion.hbm.xml</value>
+				<value>/org/lamsfoundation/lams/tool/qa/QaWizardCategory.hbm.xml</value>
 			</list>
 		</property>
 		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
@@ -69,8 +73,15 @@
 	<bean id="qaUploadedFileDAO" class="org.lamsfoundation.lams.tool.qa.dao.hibernate.QaUploadedFileDAO">
 		<property name="sessionFactory"><ref local="qaSessionFactory"/></property>
 	</bean>
-
 	
+	<bean id="qaConfigItemDAO" class="org.lamsfoundation.lams.tool.qa.dao.hibernate.QaConfigItemDAO">
+		<property name="sessionFactory"><ref local="qaSessionFactory"/></property>
+	</bean>
+	
+	<bean id="qaWizardDAO" class="org.lamsfoundation.lams.tool.qa.dao.hibernate.QaWizardDAO">
+		<property name="sessionFactory"><ref local="qaSessionFactory"/></property>
+	</bean>
+	
 	<bean id="qaToolContentHandler" class="org.lamsfoundation.lams.tool.qa.util.QaToolContentHandler">
  		<property name="repositoryService"><ref bean="repositoryService"/></property>
 	</bean> 
@@ -88,7 +99,9 @@
 					<property name="qaQueUsrDAO"><ref bean="qaQueUsrDAO"/></property>
 					<property name="qaQueContentDAO"><ref bean="qaQueContentDAO"/></property>
 					<property name="qaUsrRespDAO"><ref bean="qaUsrRespDAO"/></property>								
-					<property name="qaUploadedFileDAO"><ref bean="qaUploadedFileDAO"/></property>								
+					<property name="qaUploadedFileDAO"><ref bean="qaUploadedFileDAO"/></property>	
+					<property name="qaConfigItemDAO"><ref bean="qaConfigItemDAO"/></property>
+					<property name="qaWizardDAO"><ref bean="qaWizardDAO"/></property>								
 					<property name="toolService"><ref bean="lamsToolService"/></property>
 					<property name="repositoryService"><ref bean="repositoryService"/></property>
 					<property name="learnerService"><ref bean="learnerService"/></property>			
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java
===================================================================
diff -u -rc4dfe712e2f4adc4d448e5653df6430eb2949002 -r80a367726b9e7607851be28429bda54d9b306159
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java	(.../IQaService.java)	(revision c4dfe712e2f4adc4d448e5653df6430eb2949002)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java	(.../IQaService.java)	(revision 80a367726b9e7607851be28429bda54d9b306159)
@@ -26,6 +26,7 @@
 import java.io.InputStream;
 import java.util.Collection;
 import java.util.List;
+import java.util.SortedSet;
 
 import org.lamsfoundation.lams.contentrepository.ITicket;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
@@ -34,12 +35,14 @@
 import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.tool.qa.QaApplicationException;
 import org.lamsfoundation.lams.tool.qa.QaCondition;
+import org.lamsfoundation.lams.tool.qa.QaConfigItem;
 import org.lamsfoundation.lams.tool.qa.QaContent;
 import org.lamsfoundation.lams.tool.qa.QaQueContent;
 import org.lamsfoundation.lams.tool.qa.QaQueUsr;
 import org.lamsfoundation.lams.tool.qa.QaSession;
 import org.lamsfoundation.lams.tool.qa.QaUploadedFile;
 import org.lamsfoundation.lams.tool.qa.QaUsrResp;
+import org.lamsfoundation.lams.tool.qa.QaWizardCategory;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.util.audit.IAuditService;
 
@@ -294,6 +297,49 @@
     public String createConditionName(Collection<QaCondition> existingConditions);
 
     public void deleteCondition(QaCondition condition);
-
+    
     public QaCondition createDefaultComplexCondition(QaContent qaContent);
+    
+    /**
+     * Gets the qa config item with the given key
+     * @param configKey
+     * @return
+     */
+    public QaConfigItem getConfigItem(String configKey);
+    
+    /**
+     * Saves or updates a qa config item
+     * @param configItem
+     */
+    public void saveOrUpdateConfigItem(QaConfigItem configItem);
+    
+    /**
+     * Gets the set of wizard categories from the database
+     * @return
+     */
+    public SortedSet<QaWizardCategory> getWizardCategories();
+    
+    /**
+     * Saves the entire set of QaWizardCategories (including the child cognitive skills and questions)
+     * @param categories
+     */
+    public void saveOrUpdateQaWizardCategories(SortedSet<QaWizardCategory> categories);
+    
+    /**
+     * Deletes a wizard category from the db
+     * @param uid
+     */
+    public void deleteWizardCategoryByUID(Long uid);
+    
+    /**
+     * Deletes a wizard cognitive skill from the db
+     * @param uid
+     */
+    public void deleteWizardSkillByUID(Long uid);
+    
+    /**
+     * Deletes a wizard question from the db
+     * @param uid
+     */
+    public void deleteWizardQuestionByUID(Long uid);
 }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
===================================================================
diff -u -rc4dfe712e2f4adc4d448e5653df6430eb2949002 -r80a367726b9e7607851be28429bda54d9b306159
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	(.../QaServicePOJO.java)	(revision c4dfe712e2f4adc4d448e5653df6430eb2949002)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	(.../QaServicePOJO.java)	(revision 80a367726b9e7607851be28429bda54d9b306159)
@@ -33,6 +33,7 @@
 import java.util.Random;
 import java.util.Set;
 import java.util.SortedMap;
+import java.util.SortedSet;
 import java.util.TreeSet;
 
 import org.apache.log4j.Logger;
@@ -69,18 +70,22 @@
 import org.lamsfoundation.lams.tool.qa.QaAppConstants;
 import org.lamsfoundation.lams.tool.qa.QaApplicationException;
 import org.lamsfoundation.lams.tool.qa.QaCondition;
+import org.lamsfoundation.lams.tool.qa.QaConfigItem;
 import org.lamsfoundation.lams.tool.qa.QaContent;
 import org.lamsfoundation.lams.tool.qa.QaQueContent;
 import org.lamsfoundation.lams.tool.qa.QaQueUsr;
 import org.lamsfoundation.lams.tool.qa.QaSession;
 import org.lamsfoundation.lams.tool.qa.QaUploadedFile;
 import org.lamsfoundation.lams.tool.qa.QaUsrResp;
+import org.lamsfoundation.lams.tool.qa.QaWizardCategory;
+import org.lamsfoundation.lams.tool.qa.dao.IQaConfigItemDAO;
 import org.lamsfoundation.lams.tool.qa.dao.IQaContentDAO;
 import org.lamsfoundation.lams.tool.qa.dao.IQaQueContentDAO;
 import org.lamsfoundation.lams.tool.qa.dao.IQaQueUsrDAO;
 import org.lamsfoundation.lams.tool.qa.dao.IQaSessionDAO;
 import org.lamsfoundation.lams.tool.qa.dao.IQaUploadedFileDAO;
 import org.lamsfoundation.lams.tool.qa.dao.IQaUsrRespDAO;
+import org.lamsfoundation.lams.tool.qa.dao.IQaWizardDAO;
 import org.lamsfoundation.lams.tool.service.ILamsToolService;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
@@ -133,6 +138,8 @@
     private IAuditService auditService;
     private IExportToolContentService exportContentService;
     private QaOutputFactory qaOutputFactory;
+    private IQaConfigItemDAO qaConfigItemDAO;
+    private IQaWizardDAO qaWizardDAO;
 
     private ICoreNotebookService coreNotebookService;
 
@@ -1824,7 +1831,25 @@
     public void setQaOutputFactory(QaOutputFactory qaOutputFactory) {
 	this.qaOutputFactory = qaOutputFactory;
     }
+    
+    
 
+    public IQaConfigItemDAO getQaConfigItemDAO() {
+        return qaConfigItemDAO;
+    }
+
+    public void setQaConfigItemDAO(IQaConfigItemDAO qaConfigItemDAO) {
+        this.qaConfigItemDAO = qaConfigItemDAO;
+    }
+    
+    public IQaWizardDAO getQaWizardDAO() {
+        return qaWizardDAO;
+    }
+
+    public void setQaWizardDAO(IQaWizardDAO qaWizardDAO) {
+        this.qaWizardDAO = qaWizardDAO;
+    }
+
     public QaContent getQaContentBySessionId(Long sessionId) {
 	QaSession session = qaSessionDAO.getQaSessionOrNullById(sessionId);
 	// to skip CGLib problem
@@ -1855,8 +1880,71 @@
 	    qaDAO.deleteCondition(condition);
 	}
     }
-
+    
     public QaCondition createDefaultComplexCondition(QaContent qaContent) {
 	return getQaOutputFactory().createDefaultComplexCondition(qaContent);
     }
+    
+    /**
+     * Gets the qa config item with the given key
+     * @param configKey
+     * @return
+     */
+    public QaConfigItem getConfigItem(String configKey)
+    {
+	return qaConfigItemDAO.getConfigItemByKey(configKey);
+    }
+    
+    /**
+     * Saves or updates a qa config item
+     * @param configItem
+     */
+    public void saveOrUpdateConfigItem(QaConfigItem configItem)
+    {
+	qaConfigItemDAO.saveOrUpdate(configItem);
+    }
+    
+    /**
+     * Gets the set of wizard categories from the database
+     * @return
+     */
+    public SortedSet<QaWizardCategory> getWizardCategories()
+    {
+	return qaWizardDAO.getWizardCategories();
+    }
+    
+    /**
+     * Saves the entire set of QaWizardCategories (including the child cognitive skills and questions)
+     * @param categories
+     */
+    public void saveOrUpdateQaWizardCategories(SortedSet<QaWizardCategory> categories)
+    {
+	qaWizardDAO.saveOrUpdateCategories(categories);
+    }
+    
+    /**
+     * Deletes a wizard category from the db
+     * @param uid
+     */
+    public void deleteWizardCategoryByUID(Long uid)
+    {
+	qaWizardDAO.deleteWizardCategoryByUID(uid);
+    }
+    
+    /**
+     * Deletes a wizard cognitive skill from the db
+     * @param uid
+     */
+    public void deleteWizardSkillByUID(Long uid)
+    {
+	qaWizardDAO.deleteWizardSkillByUID(uid);
+    }
+    
+    /**
+     * Deletes a wizard question from the db
+     * @param uid
+     */
+    public void deleteWizardQuestionByUID(Long uid){
+	qaWizardDAO.deleteWizardQuestionByUID(uid);
+    }
 }
\ No newline at end of file
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java
===================================================================
diff -u -r97aceb8f087c5d2613e004dc2be171ac8acae574 -r80a367726b9e7607851be28429bda54d9b306159
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java	(.../QaAction.java)	(revision 97aceb8f087c5d2613e004dc2be171ac8acae574)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java	(.../QaAction.java)	(revision 80a367726b9e7607851be28429bda54d9b306159)
@@ -54,6 +54,7 @@
 import org.lamsfoundation.lams.tool.qa.QaAppConstants;
 import org.lamsfoundation.lams.tool.qa.QaApplicationException;
 import org.lamsfoundation.lams.tool.qa.QaCondition;
+import org.lamsfoundation.lams.tool.qa.QaConfigItem;
 import org.lamsfoundation.lams.tool.qa.QaContent;
 import org.lamsfoundation.lams.tool.qa.QaGeneralAuthoringDTO;
 import org.lamsfoundation.lams.tool.qa.QaQueContent;
@@ -915,6 +916,13 @@
 
 	request.setAttribute(QaAppConstants.TOTAL_QUESTION_COUNT, new Integer(listQuestionContentDTO.size()));
 
+	// Adding in the qa wizard data if it is turned on
+	if (qaService.getConfigItem(QaConfigItem.KEY_ENABLE_QAWIZARD) != null
+		&& qaService.getConfigItem(QaConfigItem.KEY_ENABLE_QAWIZARD).getConfigValue().equals("true")) {
+	    request.setAttribute(QaAppConstants.ATTR_WIZARD_ENABLED, true);
+	    request.setAttribute(QaAppConstants.ATTR_WIZARD_CATEGORIES, qaService.getWizardCategories());
+	}
+	
 	QaAction.logger.debug("fwd ing to newQuestionBox: ");
 	return mapping.findForward("newQuestionBox");
     }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAdminAction.java
===================================================================
diff -u
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAdminAction.java	(revision 0)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAdminAction.java	(revision 80a367726b9e7607851be28429bda54d9b306159)
@@ -0,0 +1,271 @@
+/****************************************************************
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $Id$ */
+package org.lamsfoundation.lams.tool.qa.web;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.apache.log4j.Logger;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.lamsfoundation.lams.tool.qa.QaConfigItem;
+import org.lamsfoundation.lams.tool.qa.QaWizardCategory;
+import org.lamsfoundation.lams.tool.qa.QaWizardCognitiveSkill;
+import org.lamsfoundation.lams.tool.qa.QaWizardQuestion;
+import org.lamsfoundation.lams.tool.qa.service.IQaService;
+import org.lamsfoundation.lams.tool.qa.service.QaServiceProxy;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.action.LamsDispatchAction;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+/**
+ * Handles the admin page for question and answer which includes the settings
+ * and items for the q&a question wizard
+ * 
+ * @author lfoxton
+ * 
+ * 
+ */
+public class QaAdminAction extends LamsDispatchAction {
+
+    private static Logger logger = Logger.getLogger(QaAdminAction.class.getName());
+
+    public static final String ATTR_CATEGORIES = "categories";
+    public static final String ATTR_CATEGORY = "category";
+    public static final String ATTR_QUESTION = "question";
+    public static final String ATTR_SKILL = "skill";
+    public static final String ATTR_TITLE = "title";
+    public static final String ATTR_UID = "uid";
+    public static final String NULL = "null";
+
+    IQaService qaService;
+
+    /**
+     * Sets up the admin page
+     */
+    public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+	// set up mdlForumService
+	if (qaService == null) {
+	    qaService = QaServiceProxy.getQaService(this.getServlet().getServletContext());
+	}
+
+	QaAdminForm adminForm = (QaAdminForm) form;
+
+	QaConfigItem enableQaWizard = qaService.getConfigItem(QaConfigItem.KEY_ENABLE_QAWIZARD);
+	if (enableQaWizard != null)
+	    adminForm.setQaWizardEnabled(enableQaWizard.getConfigValue());
+
+	request.setAttribute("error", false);
+	request.setAttribute(ATTR_CATEGORIES, getQaWizardCategories());
+
+	return mapping.findForward("config");
+    }
+
+    /**
+     * Saves admin page, if the wizard is enabled, saves the wizard content
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    public ActionForward saveContent(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+	QaAdminForm adminForm = (QaAdminForm) form;
+
+	// set up mdlForumService
+	if (qaService == null) {
+	    qaService = QaServiceProxy.getQaService(this.getServlet().getServletContext());
+	}
+	
+	QaConfigItem enableQaWizard = qaService.getConfigItem(QaConfigItem.KEY_ENABLE_QAWIZARD);
+
+	if (adminForm.getQaWizardEnabled() != null && adminForm.getQaWizardEnabled()) {
+	    enableQaWizard.setConfigValue(QaAdminForm.TRUE);
+	
+	    // get the wizard content and save
+	    if (adminForm.getSerialiseXML() != null && !adminForm.getSerialiseXML().trim().equals("")) {
+		updateWizardFromXML(adminForm.getSerialiseXML().trim());
+	    }
+
+	    // remove any wizard items that were removed
+	    removeWizardItems(adminForm.getDeleteCategoriesCSV(), adminForm.getDeleteSkillsCSV(), adminForm
+		    .getDeleteQuestionsCSV());
+	} 
+	else {
+	    enableQaWizard.setConfigValue(QaAdminForm.FALSE);
+	}
+	qaService.saveOrUpdateConfigItem(enableQaWizard);
+
+	request.setAttribute(ATTR_CATEGORIES, getQaWizardCategories());
+	request.setAttribute("savedSuccess", true);
+	return mapping.findForward("config");
+	
+    }
+
+    /**
+     * Gets the complete set of wizard categories
+     * @return
+     */
+    public SortedSet<QaWizardCategory> getQaWizardCategories() {
+	return qaService.getWizardCategories();
+    }
+
+    /**
+     * Removes all the removed wizard items from the db using CSV values
+     * 
+     * @param categoriesCSV
+     * @param skillsCSV
+     * @param questionsCSV
+     */
+    public void removeWizardItems(String categoriesCSV, String skillsCSV, String questionsCSV) {
+	
+	// remove categories
+	if (categoriesCSV != null && !categoriesCSV.equals("")) {
+	    String categoryUIDs[] = categoriesCSV.split(",");
+	    for (int i = 0; i < categoryUIDs.length; i++) {
+		qaService.deleteWizardCategoryByUID(Long.parseLong(categoryUIDs[i]));
+	    }
+	}
+
+	// remove skills
+	if (skillsCSV != null && !skillsCSV.equals("")) {
+	    String skillUIDs[] = skillsCSV.split(",");
+	    for (int i = 0; i < skillUIDs.length; i++) {
+		qaService.deleteWizardSkillByUID(Long.parseLong(skillUIDs[i]));
+	    }
+	}
+
+	// remove questions
+	if (questionsCSV != null && !questionsCSV.equals("")) {
+	    String questionUIDs[] = questionsCSV.split(",");
+	    for (int i = 0; i < questionUIDs.length; i++) {
+		qaService.deleteWizardQuestionByUID(Long.parseLong(questionUIDs[i]));
+	    }
+	}
+    }
+
+    /**
+     * Saves all the wizard items from the xml serialisation sent from the form
+     * @param xmlStr
+     */
+    @SuppressWarnings("unchecked")
+    public void updateWizardFromXML(String xmlStr) {
+	//SortedSet<QaWizardCategory> currentCategories = getQaWizardCategories();
+	SortedSet<QaWizardCategory> newCategories = new TreeSet<QaWizardCategory>();
+	try {
+	    DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+	    DocumentBuilder db = dbf.newDocumentBuilder();
+	    Document document = db.parse(new InputSource(new StringReader(xmlStr)));
+
+	    // Get a list of category nodes
+	    NodeList categoryNodeList = document.getElementsByTagName(ATTR_CATEGORY);
+
+	    for (int i = 0; i < categoryNodeList.getLength(); i++) {
+
+		Element categoryElement = (Element) categoryNodeList.item(i);
+
+		// Get the attributes for this category
+		NamedNodeMap categoryNamedNode = ((Node) categoryNodeList.item(i)).getAttributes();
+
+		QaWizardCategory category = new QaWizardCategory();
+		category.setTitle(categoryNamedNode.getNamedItem(ATTR_TITLE).getNodeValue());
+		category.setCognitiveSkills(new TreeSet<QaWizardCognitiveSkill>());
+
+		if (categoryNamedNode.getNamedItem(ATTR_UID).getNodeValue() != null
+			&& !categoryNamedNode.getNamedItem(ATTR_UID).getNodeValue().equals(NULL)) {
+		    category.setUid(Long.parseLong(categoryNamedNode.getNamedItem(ATTR_UID).getNodeValue()));
+		}
+
+		// Get a list of cognitive skill nodes
+		NodeList skillNodeList = categoryElement.getElementsByTagName(ATTR_SKILL);
+		for (int j = 0; j < skillNodeList.getLength(); j++) {
+		    Element skillElement = (Element) skillNodeList.item(j);
+
+		    // Get the attributes for this skill
+		    NamedNodeMap skillNamedNode = ((Node) skillNodeList.item(j)).getAttributes();
+
+		    // Create the skill and add attributes from the node
+		    QaWizardCognitiveSkill skill = new QaWizardCognitiveSkill();
+		    skill.setCategory(category);
+		    skill.setTitle(skillNamedNode.getNamedItem(ATTR_TITLE).getNodeValue());
+		    skill.setQuestions(new TreeSet<QaWizardQuestion>());
+
+		    if (skillNamedNode.getNamedItem(ATTR_UID).getNodeValue() != null
+			    && !skillNamedNode.getNamedItem(ATTR_UID).getNodeValue().equals(NULL)) {
+			skill.setUid(Long.parseLong(skillNamedNode.getNamedItem(ATTR_UID).getNodeValue()));
+		    }
+
+		    // add the skill to the parent category
+		    category.getCognitiveSkills().add(skill);
+
+		    // Get a list of questions for this skill
+		    NodeList questionNodeList = skillElement.getElementsByTagName(ATTR_QUESTION);
+		    for (int k = 0; k < questionNodeList.getLength(); k++) {
+			// Get the attributes for this question
+			NamedNodeMap questionNamedNode = ((Node) questionNodeList.item(k)).getAttributes();
+
+			// Create the question, and add attributes from the node
+			QaWizardQuestion question = new QaWizardQuestion();
+			question.setQuestion(questionNamedNode.getNamedItem(ATTR_QUESTION).getNodeValue());
+
+			if (questionNamedNode.getNamedItem(ATTR_UID).getNodeValue() != null
+				&& !questionNamedNode.getNamedItem(ATTR_UID).getNodeValue().equals(NULL)) {
+			    question.setUid(Long.parseLong(questionNamedNode.getNamedItem(ATTR_UID).getNodeValue()));
+			}
+
+			// add the question to the parent cognitive skill
+			skill.getQuestions().add(question);
+		    }
+		}
+		newCategories.add(category);
+	    }
+
+	} catch (ParserConfigurationException e) {
+	    logger.error("Could not parse wizard serialise xml", e);
+	} catch (SAXException e) {
+	    logger.error("Could not parse wizard serialise xml", e);
+	} catch (IOException e) {
+	    logger.error("Could not parse wizard serialise xml", e);
+	}
+
+	qaService.saveOrUpdateQaWizardCategories(newCategories);
+    }
+}
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAdminForm.java
===================================================================
diff -u
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAdminForm.java	(revision 0)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAdminForm.java	(revision 80a367726b9e7607851be28429bda54d9b306159)
@@ -0,0 +1,88 @@
+/****************************************************************
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $Id$ */
+package org.lamsfoundation.lams.tool.qa.web;
+
+import org.apache.struts.action.ActionForm;
+
+public class QaAdminForm extends ActionForm {
+
+    public static final long serialVersionUID = 978235712395273523L;
+    
+    public static final String TRUE= "true";
+    public static final String FALSE= "false";
+    
+    private Boolean qaWizardEnabled;
+    private String serialiseXML;
+    private String deleteCategoriesCSV;
+    private String deleteSkillsCSV;
+    private String deleteQuestionsCSV;
+    
+    public QaAdminForm() {}
+
+    public Boolean getQaWizardEnabled() {
+        return qaWizardEnabled;
+    }
+
+    public void setQaWizardEnabled(Boolean qaWizardEnabled) {
+        this.qaWizardEnabled = qaWizardEnabled;
+    }
+
+    public void setQaWizardEnabled(String qaWizardEnabled) {
+	this.qaWizardEnabled = qaWizardEnabled.equals(TRUE);
+    }
+
+    public String getSerialiseXML() {
+        return serialiseXML;
+    }
+
+    public void setSerialiseXML(String serialiseXML) {
+        this.serialiseXML = serialiseXML;
+    }
+
+    public String getDeleteCategoriesCSV() {
+        return deleteCategoriesCSV;
+    }
+
+    public void setDeleteCategoriesCSV(String deleteCategoriesCSV) {
+        this.deleteCategoriesCSV = deleteCategoriesCSV;
+    }
+
+    public String getDeleteSkillsCSV() {
+        return deleteSkillsCSV;
+    }
+
+    public void setDeleteSkillsCSV(String deleteSkillsCSV) {
+        this.deleteSkillsCSV = deleteSkillsCSV;
+    }
+
+    public String getDeleteQuestionsCSV() {
+        return deleteQuestionsCSV;
+    }
+
+    public void setDeleteQuestionsCSV(String deleteQuestionsCSV) {
+        this.deleteQuestionsCSV = deleteQuestionsCSV;
+    }
+    
+    
+}
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java
===================================================================
diff -u -rc4dfe712e2f4adc4d448e5653df6430eb2949002 -r80a367726b9e7607851be28429bda54d9b306159
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java	(.../QaStarterAction.java)	(revision c4dfe712e2f4adc4d448e5653df6430eb2949002)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java	(.../QaStarterAction.java)	(revision 80a367726b9e7607851be28429bda54d9b306159)
@@ -150,6 +150,7 @@
 import org.lamsfoundation.lams.tool.qa.QaApplicationException;
 import org.lamsfoundation.lams.tool.qa.QaComparator;
 import org.lamsfoundation.lams.tool.qa.QaCondition;
+import org.lamsfoundation.lams.tool.qa.QaConfigItem;
 import org.lamsfoundation.lams.tool.qa.QaContent;
 import org.lamsfoundation.lams.tool.qa.QaGeneralAuthoringDTO;
 import org.lamsfoundation.lams.tool.qa.QaQueContent;
@@ -165,8 +166,8 @@
  * 
  * @author Ozgur Demirtas
  * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code
- * Templates
+ * TODO To change the template for this generated type comment go to Window -
+ * Preferences - Java - Code Style - Code Templates
  * 
  * A Map data structure is used to present the UI.
  */
@@ -389,9 +390,11 @@
     }
 
     /**
-     * retrives the existing content information from the db and prepares the data for presentation purposes.
-     * ActionForward retrieveExistingContent(HttpServletRequest request, ActionMapping mapping, QaAuthoringForm
-     * qaAuthoringForm, Map mapQuestionContent, long toolContentID)
+     * retrives the existing content information from the db and prepares the
+     * data for presentation purposes. ActionForward
+     * retrieveExistingContent(HttpServletRequest request, ActionMapping
+     * mapping, QaAuthoringForm qaAuthoringForm, Map mapQuestionContent, long
+     * toolContentID)
      * 
      * @param request
      * @param mapping
@@ -521,7 +524,7 @@
 	qaAuthoringForm.setOfflineInstructions(qaContent.getOfflineInstructions());
 	sessionMap.put(QaAppConstants.ONLINE_INSTRUCTIONS_KEY, qaContent.getOnlineInstructions());
 	sessionMap.put(QaAppConstants.OFFLINE_INSTRUCTIONS_KEY, qaContent.getOfflineInstructions());
-
+	
 	QaStarterAction.logger.debug("ACTIVITY_TITLE_KEY set to:" + sessionMap.get(QaAppConstants.ACTIVITY_TITLE_KEY));
 
 	qaAuthoringForm.resetUserAction();
@@ -530,9 +533,10 @@
     }
 
     /**
-     * each tool has a signature. QA tool's signature is stored in MY_SIGNATURE. The default tool content id and other
-     * depending content ids are obtained in this method. if all the default content has been setup properly the method
-     * persists DEFAULT_CONTENT_ID in the session.
+     * each tool has a signature. QA tool's signature is stored in MY_SIGNATURE.
+     * The default tool content id and other depending content ids are obtained
+     * in this method. if all the default content has been setup properly the
+     * method persists DEFAULT_CONTENT_ID in the session.
      * 
      * readSignature(HttpServletRequest request, ActionMapping mapping)
      * 
@@ -596,7 +600,8 @@
      * 
      * @param long
      *                toolContentID
-     * @return boolean determine whether a specific toolContentID exists in the db
+     * @return boolean determine whether a specific toolContentID exists in the
+     *         db
      */
     protected boolean existsContent(long toolContentID, IQaService qaService) {
 	QaContent qaContent = qaService.loadQa(toolContentID);
@@ -610,8 +615,9 @@
     /**
      * bridges define later url request to authoring functionality
      * 
-     * executeDefineLater(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse
-     * response, IQaService qaService) throws IOException, ServletException, QaApplicationException
+     * executeDefineLater(ActionMapping mapping, ActionForm form,
+     * HttpServletRequest request, HttpServletResponse response, IQaService
+     * qaService) throws IOException, ServletException, QaApplicationException
      * 
      * @param mapping
      * @param form
Index: lams_tool_laqa/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r0af4ed13b963a588f3499b080801863d57f8ad95 -r80a367726b9e7607851be28429bda54d9b306159
--- lams_tool_laqa/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 0af4ed13b963a588f3499b080801863d57f8ad95)
+++ lams_tool_laqa/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 80a367726b9e7607851be28429bda54d9b306159)
@@ -17,6 +17,8 @@
 	   	<form-bean name="QaLearningForm" type="org.lamsfoundation.lams.tool.qa.web.QaLearningForm"/>
 	   	<form-bean name="QaMonitoringForm" type="org.lamsfoundation.lams.tool.qa.web.QaMonitoringForm"/>
 	   <form-bean name="QaConditionForm" type="org.lamsfoundation.lams.tool.qa.web.QaConditionForm"/>
+	   
+	   <form-bean name="laqa11AdminForm" type="org.lamsfoundation.lams.tool.qa.web.QaAdminForm"/>
 	</form-beans>
 	
 	  <!-- ========== Global Exceptions Definitions =================================== -->
@@ -432,7 +434,23 @@
 	
 	<action path="/clearsession"
 		type="org.lamsfoundation.lams.tool.qa.web.ClearSessionAction">
-	</action>    
+	</action>   
+	
+	<action
+      path="/laqa11admin"
+      type="org.lamsfoundation.lams.tool.qa.web.QaAdminAction"
+      name="laqa11AdminForm"
+      scope="request"
+      parameter="dispatch"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="config"
+        path="/admin/config.jsp"
+        redirect="false"
+      />
+    </action> 
  </action-mappings>
 
   <!-- Define your Struts controller in a file called struts-controller.xml and place it in your merge directory. -->
Index: lams_tool_laqa/web/admin/config.jsp
===================================================================
diff -u
--- lams_tool_laqa/web/admin/config.jsp	(revision 0)
+++ lams_tool_laqa/web/admin/config.jsp	(revision 80a367726b9e7607851be28429bda54d9b306159)
@@ -0,0 +1,527 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
+<%@ include file="/common/taglibs.jsp"%>
+
+<html>
+	<lams:head>
+		<%@ include file="/includes/jsp/qaWizardCommon.jsp"%>
+		
+		<title><fmt:message key="pageTitle.admin" /></title>
+		<lams:css/>
+		
+		<script src="<lams:LAMSURL/>/includes/javascript/jquery-latest.pack.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery-ui/jquery-ui-dialog-1.5.2.packed.js"></script>
+
+		<link type="text/css" href="<lams:LAMSURL/>/includes/javascript/jquery-ui/themes/default/ui.dialog.css" rel="stylesheet">
+		
+		<script type="text/javascript">
+		<!--
+			// Creating a 3-dimentional javascript array for category/cognitive skill/question
+			// -------------------------------------------------------------------------------
+			var categoryArray = new Array();
+			var categoryIndex = 0;
+			var skillIndex = 0;
+			var qIndex = 0;
+			<c:forEach var="category" items="${categories}">
+				categoryIndex = categoryArray.length;
+				addCategory(unescape("${category.title}"), "${category.uid}",  categoryArray.length);
+				<c:forEach var="skill" items="${category.cognitiveSkills}">
+					skillIndex = categoryArray[categoryIndex].skills.length;
+					addSkill(unescape("${skill.title}"), "${skill.uid}", categoryIndex , skillIndex);
+					<c:forEach var="question" items="${skill.questions}">
+						qIndex = categoryArray[categoryIndex].skills[skillIndex].questions.length;
+						addQuestion(unescape("${question.question}"), "${question.uid}", categoryIndex, skillIndex, qIndex)
+					</c:forEach>
+				</c:forEach>
+			</c:forEach>
+			// -------------------------------------------------------------------------------
+			
+			// Arrays of items to be deleted
+			var deleteCategories = new Array();
+			var deleteSkills = new Array();
+			var deleteQuestions = new Array();
+			
+			// the menus
+			var catMenu = null;
+			var skillMenu = null;
+			var qMenu = null;
+			
+			// Sets up the triple menu with the appropriate data
+			function setUpTripleMenu() {
+				var qaWizardEnabledBox = document.laqa11AdminForm.qaWizardEnabled;
+				var wizardDiv = document.getElementById("wizardDiv");
+				
+				if (qaWizardEnabledBox.checked)
+				{
+					wizardDiv.style.display = "block";
+				}
+				
+				qaWizardEnabledBox.onclick=toggleWizard;
+				
+				catMenu = document.laqa11AdminForm.catMenu;
+				skillMenu = document.laqa11AdminForm.skillMenu;
+				qMenu = document.laqa11AdminForm.qMenu;
+				
+				nullOptions(catMenu);
+				nullOptions(skillMenu);
+				nullOptions(qMenu);
+				
+				var i;
+				with (catMenu) {
+					options[0] = new Option('<fmt:message key="wizard.selectCategory" />', "none");
+					for(i = 0; i < categoryArray.length; i++)
+					{
+						options[i+1] = new Option(categoryArray[i].title, i);
+					} 
+					options[0].selected = true;
+				}
+			}
+			
+			// Edit an existing category
+			function editCategory(title, index)
+			{
+				var cat = categoryArray[index];
+				cat.title = title;
+				categoryArray[index] = cat;
+			}
+			
+			// Edit an existing skill
+			function editSkill(title, catIndex, index)
+			{
+				var skill = categoryArray[catIndex].skills[index];
+				skill.title = title;
+				categoryArray[catIndex].skills[index] = skill;
+			}
+			
+			// Edit an existing question
+			function editQuestion(question, catIndex, skillIndex, index)
+			{
+				var questionObj = categoryArray[catIndex].skills[skillIndex].questions[index];
+				questionObj.question = question;
+				categoryArray[catIndex].skills[skillIndex].questions[index] = questionObj;
+			}
+			
+			// Toggle the wizard view when the checkbox is selected
+			function toggleWizard()
+			{
+				$("div.wizard").toggle("fast");
+			}
+			
+			// Delete a category
+			function deleteCategory()
+			{
+				if (catMenu.selectedIndex == null || catMenu.selectedIndex <= 0)
+				{
+					alert('<fmt:message key="wizard.delete.notselected" />');
+				}
+				else
+				{
+					if (confirm('<fmt:message key="wizard.delete.warnDeleteCategory" />'))
+					{
+						var uid = categoryArray[catMenu.selectedIndex-1].uid;
+						
+						if(uid != null && uid)
+						{
+							deleteCategories[deleteCategories.length] = uid;
+						}
+						
+						categoryArray.splice(catMenu.selectedIndex-1, 1);
+						setUpTripleMenu();
+					}
+				}
+			}
+			
+			// Delete a skill
+			function deleteSkill()
+			{
+				if (skillMenu.selectedIndex == null || skillMenu.selectedIndex <= 0)
+				{
+					alert('<fmt:message key="wizard.delete.notselected" />');
+				}
+				else
+				{
+					if (confirm('<fmt:message key="wizard.delete.warnDeleteSkill" />'))
+					{
+						var uid = categoryArray[catMenu.selectedIndex-1].skills[skillMenu.selectedIndex-1].uid;
+						
+						if(uid != null && uid)
+						{
+							deleteSkills[deleteSkills.length] = uid;
+						}
+						
+						categoryArray[catMenu.selectedIndex-1].skills.splice(skillMenu.selectedIndex-1, 1);
+						changeCategory();
+					}
+				}
+			}
+			
+			// Delete a question
+			function deleteQuestion()
+			{
+				if (qMenu.selectedIndex == null || qMenu.selectedIndex <= 0)
+				{
+					alert('<fmt:message key="wizard.delete.notselected" />');
+				}
+				else
+				{
+					if (confirm('<fmt:message key="wizard.delete.warnDeleteQuestion" />'))
+					{
+						var uid = categoryArray[catMenu.selectedIndex-1].skills[skillMenu.selectedIndex-1].questions[qMenu.selectedIndex-1].uid;
+						
+						if(uid != null && uid)
+						{
+							deleteQuestions[deleteQuestions.length] = uid;
+						}
+						
+						categoryArray[catMenu.selectedIndex-1].skills[skillMenu.selectedIndex-1].questions.splice(qMenu.selectedIndex-1, 1);
+						changeSkill();
+					}
+				}
+			}
+			
+			function trim(str)
+			{
+				return str.replace(/^\s+|\s+$/g, '');
+			}
+			
+			// Special dialog for an edit
+			function editDialog(inputType, isAdd, titleStr, selectDDM)
+			{
+				if(selectDDM.selectedIndex != null && selectDDM.selectedIndex > 0)
+				{
+					var existingString = selectDDM.options[selectDDM.selectedIndex].text;
+					document.getElementById('inputText').value = existingString;
+					openDialog(inputType, isAdd, titleStr);
+				}
+				else
+				{
+					alert('<fmt:message key="wizard.edit.notSelected" />');
+				}
+			}
+			
+			// Opens the required dialog based on the parameters
+			function openDialog(inputType, isAdd, titleStr)
+			{
+
+				$("#catDialog").dialog(
+					{ 
+				    	buttons: 
+				    	{ 
+					        '<fmt:message key="wizard.ok" />': function() 
+					        { 
+					            if(handleDialogInput(inputType, isAdd))
+					            {
+									document.getElementById('inputText').value = "";
+					            	$(this).dialog("close"); 
+					            }
+					        }, 
+					       '<fmt:message key="label.cancel" />': function() 
+					        { 
+					            document.getElementById('inputText').value = "";
+					            $(this).dialog("close"); 
+					        } 
+					    },
+					    height: 120,
+					    width: 350,
+					    title: titleStr
+					}
+				);
+	
+			}
+			
+			function handleDialogInput(inputType, isAdd)
+			{
+				var inputText = trim(document.getElementById("inputText").value);
+				if (inputText == null || inputText == "")
+				{
+					alert('<fmt:message key="wizard.edit.fieldRequired" />');
+					return false
+				}
+
+				if (inputType=="category")
+				{
+					with (catMenu) 
+		            {
+						if (isAdd)
+						{
+							addCategory(inputText, null, categoryArray.length, true);
+							setUpTripleMenu();
+							options[categoryArray.length].selected = true;
+						}
+						else
+						{
+							editCategory(inputText, catMenu.selectedIndex -1);
+							var indexSelect = catMenu.selectedIndex;
+							setUpTripleMenu();
+							options[indexSelect].selected = true;
+							changeCategory();
+							changeSkill();
+						}
+						
+					}
+				}
+				else if (inputType=="skill")
+				{
+					with (skillMenu) 
+		            {
+					
+						if (isAdd)
+						{
+							if (catMenu.selectedIndex != null && catMenu.selectedIndex > 0)
+							{
+								addSkill(inputText, null, catMenu.selectedIndex - 1 , categoryArray[catMenu.selectedIndex - 1].skills.length);
+								changeCategory();
+								options[options.length -1].selected = true;
+								
+							}
+							else
+							{
+								alert('<fmt:message key="wizard.add.mustSelectCategory" />');
+								return false;
+							}
+						}
+						else
+						{
+							editSkill(inputText, catMenu.selectedIndex -1, skillMenu.selectedIndex -1);
+							indexSelect = skillMenu.selectedIndex;
+							changeCategory();
+							options[indexSelect].selected = true;
+							changeSkill();
+						}
+					}
+				}
+				else if (inputType=="question")
+				{
+					with (qMenu) 
+		            {
+						var catIndex = catMenu.selectedIndex - 1;
+						var skillIndex = skillMenu.selectedIndex -1;
+						if (isAdd)
+						{
+							if (catMenu.selectedIndex != null && catMenu.selectedIndex > 0 && skillMenu.selectedIndex != null && skillMenu.selectedIndex > 0 )
+							{
+								var qIndex = categoryArray[catIndex].skills[skillIndex].questions.length;
+								addQuestion(inputText, null, catIndex, skillIndex, qIndex)
+								changeSkill();
+								options[options.length -1].selected = true;
+							}
+							else
+							{
+								alert('<fmt:message key="wizard.add.mustSelectSkill" />');
+								return false;
+							}
+							
+						}
+						else
+						{
+							var indexSelect = qMenu.selectedIndex;
+							editQuestion(inputText, catIndex, skillIndex, indexSelect -1)
+							changeSkill();
+							options[indexSelect].selected = true;
+						}
+					}
+				}
+				return true;	
+			}
+			
+			// Serialises the javascript data befor performing the submit
+			function submitForm()
+			{
+				// Serialise the categores, skills an questions in the 3d array
+				// into an xml string
+				if (categoryArray.length > 0)
+				{
+					var xmlString = '<?xml version="1.0"?><categories>';
+					var i, j, k;
+					for (i=0; i<categoryArray.length; i++)
+					{
+						var categoryString = '<category'+
+							' uid="' + categoryArray[i].uid + '"'+
+							' title="' + escape(categoryArray[i].title) + '"'+
+							' >';
+					
+						for(j=0; j<categoryArray[i].skills.length; j++)
+						{
+							var skillString = '<skill'+
+								' uid="'+ categoryArray[i].skills[j].uid + '"'+
+								' title="'+ escape(categoryArray[i].skills[j].title) + '"'+
+								' >';
+							
+							for (k=0; k<categoryArray[i].skills[j].questions.length; k++)
+							{
+								var questionString = '<question'+
+									' uid="'+ categoryArray[i].skills[j].questions[k].uid + '"'+
+									' question="'+ escape(categoryArray[i].skills[j].questions[k].question) + '"'+
+									' />';
+								skillString += questionString;
+							}
+							skillString += "</skill>";
+							categoryString += skillString;
+						}
+						categoryString += "</category>";
+						xmlString += categoryString;
+					}
+					xmlString += "</categories>";
+					document.getElementById("serialiseXML").value = xmlString;
+				}
+				
+				// serialise the deleted catergories
+				if (deleteCategories.length >0)
+				{
+					var i;
+					var CSV = deleteCategories[0];
+					for (i=1; i< deleteCategories.length; i++)
+					{
+						CSV += "," + deleteCategories[i];
+					}
+					document.getElementById("deleteCategoriesCSV").value = CSV;
+				}
+				
+				// serialise the deleted skills
+				if (deleteSkills.length >0)
+				{
+					var i;
+					var CSV = deleteSkills[0];
+					for (i=1; i< deleteSkills.length; i++)
+					{
+						CSV += "," + deleteSkills[i];
+					}
+					document.getElementById("deleteSkillsCSV").value = CSV;
+				}
+				
+				// serialise the deleted questions
+				if (deleteQuestions.length >0)
+				{
+					var i;
+					var CSV = deleteQuestions[0];
+					for (i=1; i< deleteQuestions.length; i++)
+					{
+						CSV += "," + deleteQuestions[i];
+					}
+					document.getElementById("deleteQuestionsCSV").value = CSV;
+				}
+				
+				document.laqa11AdminForm.submit();
+			}
+		//-->
+		</script>
+	
+		
+	
+	</lams:head>
+	
+	<body class="stripes" onload="javascript:setUpTripleMenu();">
+
+		<div id="content">
+	
+		<h1>
+			<fmt:message key="pageTitle.admin" />
+		</h1>
+		
+		<a href="<lams:LAMSURL/>/admin/sysadminstart.do"><fmt:message key="admin.return" /></a>
+	
+		
+
+		<c:if test="${error}">
+			<p class="warning">
+				<fmt:message key="admin.formError" />
+			</p>
+		</c:if>
+		<c:if test="${savedSuccess}">
+			<p class="info">
+				<fmt:message key="admin.success" />
+			</p>
+		</c:if>
+		<c:if test="${deleteSuccess}">
+			<p class="info">
+				<fmt:message key="${deleteLangKey}" />
+			</p>
+		</c:if>
+		
+		
+		<html:form action="/laqa11admin" styleId="laqa11AdminForm" method="post" enctype="multipart/form-data">
+			<html:hidden property="serialiseXML" styleId="serialiseXML" value="" />
+			<html:hidden property="deleteCategoriesCSV" styleId="deleteCategoriesCSV" value="" />
+			<html:hidden property="deleteSkillsCSV" styleId="deleteSkillsCSV" value="" />
+			<html:hidden property="deleteQuestionsCSV" styleId="deleteQuestionsCSV" value="" />
+			<html:hidden property="dispatch" styleId="dispatch" value="saveContent" />
+			
+			<table class="alternative-color">
+				<tr>
+					<td width="70%">
+						<fmt:message key="admin.enableWizard" />
+					</td>
+					<td width="30%">
+						<html:checkbox property="qaWizardEnabled" styleId="qaWizardEnabled"></html:checkbox>
+					</td>
+				</tr>
+			</table>
+
+			<div class="wizard" style="display:none;" id="wizardDiv">
+				<h3><fmt:message key="wizard.wizardTitle" /></h3>
+				<br />
+				<table border="0" cellspacing="10px">
+					<tbody>
+					    <tr>
+					      	<td align="left" valign="top" width="300">
+								<select name="catMenu" onchange="changeCategory()" size="1" style="font-size:10px; width:100%;">
+								</select> 
+					      	</td>
+					      	<td align="left">
+					      		<a href='javascript:openDialog("category", true, &quot;<fmt:message key="wizard.addCategory" />&quot;);' class="button"  ><fmt:message key="wizard.add" /></a>
+					      		&nbsp;
+					      		<a href='javascript:editDialog("category", false, &quot;<fmt:message key="wizard.editCategory" />&quot;, document.laqa11AdminForm.catMenu);' class="button"  ><fmt:message key="wizard.edit" /></a>
+					      		&nbsp;
+					      		<a href='javascript:deleteCategory();' class="button"  ><fmt:message key="wizard.delete" /></a>
+					      	</td>
+					    </tr>
+					    <tr>
+					      	<td align="left" valign="top" width="300">
+						      	<select name="skillMenu" onchange="changeSkill()" size="1" style="font-size:10px; width:100%;">
+						      	</select> 
+					      	</td>
+					      	<td align="left" valign="top">
+					      		<a href='javascript:openDialog("skill", true, &quot;<fmt:message key="wizard.addSkill" />&quot;);' class="button"  ><fmt:message key="wizard.add" /></a>
+					      		&nbsp;
+					      		<a href='javascript:editDialog("skill", false, &quot;<fmt:message key="wizard.editSkill" />&quot;, document.laqa11AdminForm.skillMenu);' class="button"  ><fmt:message key="wizard.edit" /></a>
+					      		&nbsp;
+					      		<a href='javascript:deleteSkill();' class="button"  ><fmt:message key="wizard.delete" /></a>
+					      	</td>
+					    </tr>
+					    <tr>
+					      	<td align="left" valign="top" width="300">
+					      		<select name="qMenu" size="1" style="font-size:10px; width:100%;">
+					      		</select>
+					      	</td>
+					      	<td align="left" valign="top" >
+					      		<a href='javascript:openDialog("question", true, &quot;<fmt:message key="wizard.addQuestion" />&quot;);' class="button"  ><fmt:message key="wizard.add" /></a>
+					      		&nbsp;
+					      		<a href='javascript:editDialog("question", false, &quot;<fmt:message key="wizard.editQuestion" />&quot;, document.laqa11AdminForm.qMenu);' class="button"  ><fmt:message key="wizard.edit" /></a>
+					      		&nbsp;
+					      		<a href='javascript:deleteQuestion();' class="button"  ><fmt:message key="wizard.delete" /></a>
+					      	</td>
+					    </tr>
+					  </tbody>
+				  </table>
+				  <br />
+			</div>
+		
+			<a href="javascript:submitForm()" class="button"  ><fmt:message key="label.save" /></a>
+
+		
+			<div id="dialogDiv" style="display: none;">
+				<div id="catDialog" class="ui-dialog ui-draggable ui-resizable"  >
+					<input type="text" id="inputText" width="255" size="40">
+				</div>	
+			</div>
+		</html:form>	
+		</div>
+		<!--closes content-->
+	
+		<div id="footer">
+		</div>
+		<!--closes footer-->
+	</body>
+
+</head>
\ No newline at end of file
Index: lams_tool_laqa/web/authoring/newQuestionBox.jsp
===================================================================
diff -u -r18e5e690d2e1a7c3d918759f7a2827c8205feaac -r80a367726b9e7607851be28429bda54d9b306159
--- lams_tool_laqa/web/authoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac)
+++ lams_tool_laqa/web/authoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision 80a367726b9e7607851be28429bda54d9b306159)
@@ -25,8 +25,10 @@
 <lams:html>
 	<lams:head>
 		<%@ include file="/common/header.jsp"%>
+		<%@ include file="/includes/jsp/qaWizardCommon.jsp"%>
+		
 		<lams:css style="tabbed" />
-
+		<script src="<lams:LAMSURL/>/includes/javascript/jquery-latest.pack.js"></script>
 		<script language="JavaScript" type="text/JavaScript">
 
 			function submitMethod() {
@@ -38,10 +40,91 @@
 				document.QaAuthoringForm.submit();
 			}
 			
+			<c:choose>
+				<c:when test="${wizardEnabled == true}">
+
+					// Creating a 3-dimentional javascript array for category/cognitive skill/question
+					// -------------------------------------------------------------------------------
+					var categoryArray = new Array();
+					var categoryIndex = 0;
+					var skillIndex = 0;
+					var qIndex = 0;
+					<c:forEach var="category" items="${wizardCategories}">
+						categoryIndex = categoryArray.length;
+						addCategory(unescape("${category.title}"), "${category.uid}",  categoryArray.length);
+						<c:forEach var="skill" items="${category.cognitiveSkills}">
+							skillIndex = categoryArray[categoryIndex].skills.length;
+							addSkill(unescape("${skill.title}"), "${skill.uid}", categoryIndex , skillIndex);
+							<c:forEach var="question" items="${skill.questions}">
+								qIndex = categoryArray[categoryIndex].skills[skillIndex].questions.length;
+								addQuestion(unescape("${question.question}"), "${question.uid}", categoryIndex, skillIndex, qIndex)
+							</c:forEach>
+						</c:forEach>
+					</c:forEach>
+					// -------------------------------------------------------------------------------
+				
+					// the menus
+					var catMenu = null;
+					var skillMenu = null;
+					var qMenu = null;
+				
+					// Sets up the triple menu with the appropriate data
+					function setUpTripleMenu() {
+						var qaWizardEnabledBox = document.QaAuthoringForm.qaWizardEnabled;
+
+						catMenu = document.QaAuthoringForm.catMenu;
+						skillMenu = document.QaAuthoringForm.skillMenu;
+						qMenu = document.QaAuthoringForm.qMenu;
+						
+						nullOptions(catMenu);
+						nullOptions(skillMenu);
+						nullOptions(qMenu);
+						
+						var i;
+						with (catMenu) {
+							options[0] = new Option('<fmt:message key="wizard.selectCategory" />', "none");
+							for(i = 0; i < categoryArray.length; i++)
+							{
+								options[i+1] = new Option(categoryArray[i].title, i);
+							} 
+							options[0].selected = true;
+						}
+					}
+
+					$(document).ready(function() {
+			
+						$("a#gwizard").click(function() {
+							$("div.wizard").toggle("fast");
+						});
+					});
+					
+					// Inserts the question template into the new question fckeditor area
+					function useQuestionTemplate(aMenu) {
+						if (aMenu.selectedIndex > 0) {
+							var obj = document.getElementById("newQuestion");
+							obj.value += aMenu.options[aMenu.selectedIndex].text;
+							var oEditor = FCKeditorAPI.GetInstance("newQuestion");
+							oEditor.InsertHtml(aMenu.options[aMenu.selectedIndex].text);
+						} 
+					}
+				
+				</c:when>
+				<c:otherwise>
+					function setUpTripleMenu() {}
+				</c:otherwise>
+			</c:choose>
 		</script>
+		
+		<style>
+			.wizard {
+				background:url('../../images/css/greyfade_bg.jpg') repeat-x 3px 0px;
+				border: 2px solid #EEEEEE;
+			}
+		</style> 
 	</lams:head>
 
-	<body>
+	
+	<body onload="javascript:setUpTripleMenu();">
 		<html:form action="/authoring?validate=false"
 			styleId="newQuestionForm" enctype="multipart/form-data" method="POST">
 			<html:hidden property="dispatch" value="addSingleQuestion" />
@@ -53,6 +136,50 @@
 			<html:hidden property="defineLaterInEditMode" />
 			<html:hidden property="contentFolderID" />
 			<html:hidden property="editQuestionBoxRequest" value="false" />
+			
+			<c:if test="${wizardEnabled == true}">
+				<a style="float:right;" id="gwizard" href="#"><fmt:message key="wizard.author.wizardTitle" /></a>
+				<div class="wizard" style="display:block;">
+					<h3>
+						<fmt:message key="wizard.author.wizardTitle" />
+					</h3>
+					
+					<table border="0">
+						<tr>
+							<td colspan="3" valign="top" style="font-size:11px">
+							    <fmt:message key="wizard.author.info1" /><br />
+							    <fmt:message key="wizard.author.info2" /><br />
+							    <fmt:message key="wizard.author.info3" /><br />	
+							</td>
+						</tr>  
+						<tr align="center">
+							<td align="center" valign="top" width="171" style="font-size:11px">
+								<fmt:message key="wizard.selectCategory" />
+							</td>
+							<td align="center" valign="top" width="176" style="font-size:11px">
+								 <fmt:message key="wizard.selectSkill" />
+							</td>
+							<td align="center" valign="top" width="169" style="font-size:11px">
+								 <fmt:message key="wizard.selectQuestion" />
+							</td>
+						</tr>
+						<tr align="center">
+							<td align="center" valign="top" width="171">
+								<select name="catMenu" onchange="changeCategory()" size="1" style="font-size:10px; width:100%;">
+								</select> 
+							</td>
+							<td align="center" valign="top" width="176">
+							    <select name="skillMenu" onchange="changeSkill()" size="1" style="font-size:10px; width:100%;">
+								</select> 
+							</td>
+							<td align="center" valign="top" width="169">
+							    <select name="qMenu" onchange="useQuestionTemplate(this)" size="1" style="font-size:10px; width:100%;">
+								</select>
+							</td>
+						</tr>
+					</table>
+				</div>
+			</c:if>
 
 			<div class="field-name space-top">
 				<fmt:message key="label.add.new.question"></fmt:message>
@@ -74,6 +201,8 @@
 				<a href="#" onclick="javascript:window.parent.hideMessage()"
 					class="button space-left"> <fmt:message key="label.cancel" /> </a>
 			</lams:ImgButtonWrapper>
+			
+			
 		</html:form>
 	</body>
 </lams:html>
Index: lams_tool_laqa/web/includes/jsp/qaWizardCommon.jsp
===================================================================
diff -u
--- lams_tool_laqa/web/includes/jsp/qaWizardCommon.jsp	(revision 0)
+++ lams_tool_laqa/web/includes/jsp/qaWizardCommon.jsp	(revision 80a367726b9e7607851be28429bda54d9b306159)
@@ -0,0 +1,82 @@
+<!-- Javascript functions used for q&a wizard, made into jsp for language tags  -->
+<script language="JavaScript" type="text/JavaScript">
+<!--
+	
+	// Add a category to the categoryArray
+	function addCategory(title, uid, index)
+	{
+		var cat = new Object();
+		cat.title = title;
+		cat.uid = uid;
+		cat.skills = new Array();
+		categoryArray[index] = cat;
+	}
+	
+	// Adds a skill object to the skill array (containted in the category array)
+	function addSkill(title, uid, catIndex, index)
+	{
+		var skill = new Object();
+		skill.title = title;
+		skill.uid = uid;
+		skill.questions = new Array();
+		categoryArray[catIndex].skills[index] = skill;
+	}
+	
+	// Adds a question object to the question array, (contained within the skill array0
+	function addQuestion(question, uid, catIndex, skillIndex, index)
+	{
+		var questionObj = new Object();
+		questionObj.uid = uid;
+		questionObj.question = question;
+		categoryArray[catIndex].skills[skillIndex].questions[index] = questionObj;
+	}
+	
+	// Removes all the options in a menu
+	function nullOptions(aMenu) {
+		aMenu.options.length = 0;
+	}
+	
+	// Changes a category when it is selected, the skills options are populated with the corresponding data
+	function changeCategory() 
+	{
+		nullOptions(skillMenu);
+		nullOptions(qMenu);
+	
+		if (catMenu.selectedIndex != 0)
+		{
+			var skillArray = categoryArray[catMenu.selectedIndex -1].skills;
+			
+			var i;
+			with (skillMenu) {
+				options[0] = new Option('<fmt:message key="wizard.selectSkill" />', "none");
+				for(i = 0; i < skillArray.length; i++)
+				{
+					options[i+1] = new Option(skillArray[i].title, i);
+				} 
+				options[0].selected = true;
+			}
+		}
+	}
+	
+	// Changes a skill when selected, the questions options are poulated with the corresponding data
+	function changeSkill() 
+	{
+		nullOptions(qMenu);
+	
+		if (catMenu.selectedIndex != 0 && skillMenu.selectedIndex != 0)
+		{
+			var questionArray = categoryArray[catMenu.selectedIndex -1].skills[skillMenu.selectedIndex -1].questions;
+			
+			var i;
+			with (qMenu) {
+				options[0] = new Option('<fmt:message key="wizard.selectQuestion" />', "none");
+				for(i = 0; i < questionArray.length; i++)
+				{
+					options[i+1] = new Option(questionArray[i].question, i);
+				} 
+				options[0].selected = true;
+			}
+		}
+	}
+//-->
+</script>
\ No newline at end of file