Index: lams_tool_scratchie/.classpath
===================================================================
diff -u -r6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18 -rded32af47a9de99cb3319fdd7461906323f7e293
--- lams_tool_scratchie/.classpath	(.../.classpath)	(revision 6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18)
+++ lams_tool_scratchie/.classpath	(.../.classpath)	(revision ded32af47a9de99cb3319fdd7461906323f7e293)
@@ -15,5 +15,5 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_learning"/>
 	<classpathentry kind="var" path="JBOSS_HOME/common/lib/log4j.jar"/>
-	<classpathentry kind="output" path="build/classes/java"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: lams_tool_scratchie/build.properties
===================================================================
diff -u -r6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18 -rded32af47a9de99cb3319fdd7461906323f7e293
--- lams_tool_scratchie/build.properties	(.../build.properties)	(revision 6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18)
+++ lams_tool_scratchie/build.properties	(.../build.properties)	(revision ded32af47a9de99cb3319fdd7461906323f7e293)
@@ -1,27 +1,7 @@
-########################################################################################################################
-### BUILD PROPERTIES                                                                                                 ###
-### 1) Do *NOT* use backslashes in paths unless you are sure the ANT task treats them properly.                      ###
-### 2) Use only ant variables (${foo}) that You declared above or make *SURE* You derive them from the right place.  ###
-### 3) Comment out boolean style build settings instead of setting false. Set to false may fail.                     ###
-### 4) Uncommenting the forceClean attribute *WILL* delete your sourcecode to make place for vcs controlled builds.  ###
-###
-########################################################################################################################
+# Minimum compatible version of server
+min.server.version.number=2.0 
 
-### project properties ###
 signature=lascrt11
-project.displayname = lams scratchie tool
-
-#project version
 tool.version=20110509
-
-# hide tool option
-hideTool=false
-
-# Minimum compatible version
-min.server.version.number=2.0
-
-# packages
-tool.package=org.lamsfoundation.lams.tool.scratchie
-language.files.package=${tool.package}
-# Precompiled JSP classes package
-jsp.java.src.package=${tool.package}.jsp
+tool.hide=false
+tool.short.name=scratchie
\ No newline at end of file
Index: lams_tool_scratchie/build.xml
===================================================================
diff -u -r6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18 -rded32af47a9de99cb3319fdd7461906323f7e293
--- lams_tool_scratchie/build.xml	(.../build.xml)	(revision 6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18)
+++ lams_tool_scratchie/build.xml	(.../build.xml)	(revision ded32af47a9de99cb3319fdd7461906323f7e293)
@@ -1,576 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="lams_tool_scratchie" basedir="." default="_build">
-	<!-- begin properties *******************************************************************************************-->
-	<!-- import properties from the specified file -->
-	<property file="build.properties"/>
-	<property file="../lams_build/common.properties"/>
-	<property file="../lams_build/${osPropertiesName}.properties" />
-	
-	<property name="project.displayname" value="${project} - ${project.displayname}"/>
-	<property name="project.description" value="${project} - ${project.description}"/>
 
-	<!-- end properties *********************************************************************************************-->
+<project name="LAMS Tool Scratchie" basedir="."> 
+	<import file="../lams_build/build_tools_base.xml"/>
 
-	<!-- begin path *************************************************************************************************-->
-	<path id="all-libs">
-		<fileset dir="${sharedlib}">
-			<include name="**/*.jar"/>
-		</fileset>
-		<fileset dir="${j2eelibs}">
-			<include name="**/*.jar"/>
-		</fileset>
-	</path>
-
-	<path id="project.classpath">
-		<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}" />
-	</path>
-	<path id="schemaexport.classpath">
-		<path refid="project.classpath"/>
-		<pathelement location="${build.classes.java}"/>
-	</path>
-
-	<!-- end path ***************************************************************************************************-->
-
-	<!-- begin tasks ***********************************************************************************************/-->
-	<target name="init">
-		<echo>+------------------------------------------+</echo>
-		<echo>| creating directory structure             |</echo>
-		<echo>+------------------------------------------+</echo>
-
-		<!-- build filesystem structure /-->
-        <mkdir dir="${build}"/>
-		<mkdir dir="${build.classes.java}"/>
-        <mkdir dir="${build.report}"/>
-        <mkdir dir="${build.lib}"/>
-        <mkdir dir="${build.deploy}"/>
-        <mkdir dir="${build.classes.test}"/>
-        <mkdir dir="${build.report}"/>
-	</target>
-
-
-	<target name="clean" description="Delete all generated files">
-		<echo>+------------------------------------------+</echo>
-		<echo>| clean                                    |</echo>
-		<echo>+------------------------------------------+</echo>
-
-		<delete dir="${build}" quiet="false"/>
-		<mkdir dir="${build}"/>
-
-	</target>
-			
-	<target name="compile-java" description="Compiles the Task" depends="init">
-		<javac srcdir="${src.java.dir}"
-            source="1.5"
-            debug="on"
-            compiler="modern"
-            classpathref="project.classpath"
-            destdir="${build.classes.java}"/>
-	 	<copy overwrite="yes" todir="${build.classes.java}" verbose="true">
-			<fileset dir="${src.java.dir}">
-				<include name="**/*.xml"/>
-				<include name="**/*.properties"/>
-				<!-- Autopatch -->
-				<include name="**/*.sql"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="generate-hbm" depends="compile-java">
-		<echo>+------------------------------------------+</echo>
-		<echo>| generating hibernate metadata            |</echo>
-		<echo>+------------------------------------------+</echo>
-
-		<taskdef name="hibernatedoclet"
-			classname="xdoclet.modules.hibernate.HibernateDocletTask"
-			classpathref="all-libs"/>
-
-		<echo>Building hbm.xml files using XDoclet to ${conf.hibernate.mapping.dir} from ${src.java.dir}</echo>
-
-		<hibernatedoclet
-			destdir="${conf.hibernate.mapping.dir}"
-			excludedtags="@version,@author,@todo"
-			force="true">
-				<fileset dir="${src.java.dir}">
-					<include name="**/*.java"/>
-				</fileset>
-			<hibernate version="3.0"/>
-		</hibernatedoclet>
-    </target>
-	
-	<!-- exports all the hbm mappings to the specified database -->
-	<target name="schemaexport" description="Exports all hbm.xml files in {conf.hibernate.mapping.dir}/hbm"
-		depends="clean,generate-hbm">
-	    <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
-			config="${conf.hibernate.mapping.dir}/hibernate.cfg.xml"
-			quiet="no"
-			text="no"
-			drop="no"
-			delimiter=";"
-			output="${db.scripts}/table-schema.sql">
-			<fileset dir="${conf.hibernate.mapping.dir}">
-				<include name="**/*.hbm.xml"/>
-			</fileset>
-		</schemaexport>	
-	</target>	
-	
-	<target name="compile-test" depends="compile-java">
-		<javac srcdir="${src.test.dir}" compiler="modern"
-	         	 	destdir="${build.classes.test}" deprecation="on" debug="on">
-			<classpath>
-				<pathelement location="${build.classes.java}"/>
-				<path refid="project.classpath"/>
-			</classpath>
-		</javac>
-		<copy overwrite="yes" todir="${build.classes.test}">
-			<fileset dir="${src.test.dir}">
-				<include name="**/*.xml"/>
-			</fileset>
-		</copy>
-	</target>
-	
-	<!-- =================================================================== -->
-	<!-- Scratchie Database tasks                                       -->
-	<!-- =================================================================== -->
-	<target name="clean-db"	description="clean scratchie database.">
-		<sql driver="${db.driver}" url="${db.url.build}" userid="${db.username}"
-				password="${db.password}"  encoding="${db.encoding}">
-			<classpath>
-				<fileset dir="${db.driver.dir}" includes="*.jar"/> 
-			</classpath>
-			<transaction src="${db.scripts}/cleanup_lams_tool_scratchie.sql"/>
-		</sql>
-	</target>
-	
-	<target name="init-db"	description="drop and create forum database.">
-		<sql driver="${db.driver}" url="${db.url.build}" userid="${db.username}"
-				password="${db.password}"  encoding="${db.encoding}">
-			<classpath>
-				<fileset dir="${db.driver.dir}" includes="*.jar"/> 
-			</classpath>
-			<transaction src="${db.scripts}/drop_lams_tool_scratchie.sql"/>
-			<transaction src="${db.scripts}/create_lams_tool_scratchie.sql"/>
-		</sql>
-	</target>
-	
-	<target name="build-db"	depends="init-db" 
-							description="build qa tool database.">
-		<sql driver="${db.driver}" url="${db.url.build}" userid="${db.username}"
-				password="${db.password}"  encoding="${db.encoding}">
-			<classpath>
-				<fileset dir="${db.driver.dir}" includes="*.jar"/> 
-			</classpath>
-			<transaction src="${db.scripts}/insert_lams_tool_scratchie_data.sql"/>
-		</sql>
-	</target>
-
-	<target name="test-report" depends="compile-test, init-db">
-
-		<mkdir dir="${build.report}"/>
-		<mkdir dir="${build.report}/html"/> 
-		
-		<junit printsummary="yes" errorProperty="test.failed" failureProperty="test.failed"
-			   fork="yes">
-			<formatter type="plain" usefile="false"/>
-			<formatter type="xml"/>
-			<batchtest todir="${build.report}">
-				<fileset dir="${src.test.dir}">
-	                 <include name="org/lamsfoundation/lams/tool/scratchie/**/*.*"/>
-				</fileset>
-			</batchtest>
-			<classpath>
-				<pathelement location="${build.classes.java}"/>
-				<pathelement location="${build.classes.test}"/>
-				<pathelement location="${conf.hibernate.mapping.dir}"/>
-				<pathelement location="${conf.web.dir}"/>
-				<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>
-		
-		<fail message="Tests failed. Check log and/or reports" if="test.failed"/>
-	</target>
-
-	<target name="jar" description="JARs the Task" depends="generate-hbm, compile-java">
-		<echo>+------------------------------------------+</echo>
-		<echo>| create jar file                          |</echo>
-		<echo>+------------------------------------------+</echo>
-		<delete file="${build.lib}/${product}.jar"/>
-		<jar destfile="${build.lib}/${product}.jar" manifest="${conf.dir}/jar/META-INF/MANIFEST.MF">
-			<fileset dir="${build.classes.java}">
-			</fileset>
-			<fileset dir="${conf.hibernate.mapping.dir}">
-			</fileset>
-		</jar> 
-	</target>
-
-    <target name="web"  description="generates xdoclet for web">
-	    <taskdef
-	        name="webdoclet"
-	        classname="xdoclet.modules.web.WebDocletTask"
-	        classpathref="project.classpath"
-	    />
-		<webdoclet destDir="${conf.webinf.dir}" force="${xdoclet.force}" 
-			mergedir="${conf.xdoclet.dir}" verbose="true">
-			
-         <fileset dir="${src.java.dir}">
-            <include name="**/*Action.java" />
-            <include name="**/*Form.java" />
-         </fileset>
-		
-		<!--
-         <deploymentdescriptor servletspec="2.4" 
-				distributable="false" sessiontimeout="${sessiontimeout}"/>
-		-->
-         <strutsconfigxml validatexml="true" version="1.2" mergedir="${conf.xdoclet.dir}"/>
-         <!-- <strutsdynaformvalidationxml destdir="${conf.webinf.dir}" mergedir="${conf.xdoclet.dir}" version="1.1.3"  /> -->
-
-      </webdoclet>
-
-	</target>
-
-	<target name="build-war" depends="web,jsp-plaincopy,jsp-precompile" description="creates war file">
-		<echo>+------------------------------------------+</echo>
-		<echo>| build jar file                           |</echo>
-		<echo>+------------------------------------------+</echo>
-		<delete file="${build.lib}/${product}.war"/>
-		<war warfile="${build.lib}/${product}.war" 
-  				webxml="${build.war}/WEB-INF/web.xml" manifest="${conf.dir}/war/META-INF/MANIFEST.MF">
-			<fileset dir="${build.war.assembly}">
-				<include name="**" />
-			</fileset>
-		</war>
-	</target>
-
-	   <target name="copy-tags" depends="" description="copy the lams.tld and the lams tags">
-	   		<copy todir="${conf.webinf.dir}/tlds/lams" 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>
-
-	<!-- =================================================================== -->
-	<!-- Deploy the jar and war                               				 -->
-	<!-- =================================================================== -->
-	<target name="deploy-war" depends="_build" description="Deploy the IMS Content Package tool war file and jar file">
-		<copy file="${build.lib}/${product}.jar"
-				todir="${jboss.deploy}"/> 
-		<copy file="${build.lib}/${product}.war"
-				todir="${jboss.deploy}"/> 
-	</target>
-
-	<!-- =================================================================== -->
-	<!-- Generate the deploy package                                         -->
-	<!-- =================================================================== -->
-	<target name="create-deploy-package" depends="_build" 
-		description="Generate the deployment package.">
-
-		<echo>+------------------------------------------+</echo>
-		<echo>| Generate the deployment package.         |</echo>
-		<echo>+------------------------------------------+</echo>
-		<path id="deploy.lib.classpath">
-			<fileset dir="${deploy.tool.dir}">
-				<include name="lib/*.jar" />
-			</fileset>
-			<fileset dir="${sharedlib}">
-				<include name="**/*.jar" />
-			</fileset>
-		</path>
-			  
-		<mkdir dir="${build.deploy}"/>
-		
-		<mkdir dir="${build.deploy}/sql"/> 
-		<mkdir dir="${build.deploy}/language"/> 
-		 
-		<copy overwrite="yes" todir="${build.deploy}/sql">
-			<fileset dir="${db.scripts}/">
-				<include name="create_lams_tool_scratchie.sql"/>
-				<include name="drop_lams_tool_scratchie.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>
-		
-		<copy overwrite="yes" todir="${build.deploy}/">
-			<fileset dir="${deploy.tool.dir}">
-				<include name="*.*"/>
-			</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>
-		<copy overwrite="yes" todir="${build.deploy}/language">
-				<fileset dir="${conf.language.dir}">
-					<include name="*.properties"/>
-					<include name="*.txt"/>
-				</fileset>
-		</copy>	
-		
-		<generateDeployProperties depends="compile" 
-			mode="development" 
-			outputPath="${build.deploy}"
-			generateForInstallers="${generate.for.installers}"
-			dbPassword="${db.password}"
-			dbUsername="${db.username}"
-			dbDriverUrl="${db.url.build}"
-			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_scratchie.sql" 
-			toolTablesDeleteScriptPath="${build.deploy}/sql/drop_lams_tool_scratchie.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/scratchie/scratchieApplicationContext.xml"
-
-			lamsEarPath="${jboss.deploy}"
-			toolContext="${toolContext}"
-			toolWebUri="${product}.war"
-			languageFilesPackage="org.lamsfoundation.lams.tool.scratchie">
-
-			<!-- 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="run-deploy-package" description="Run the deploy tool.">
-				<path id="deploy.classpath">
-					<fileset dir="${deploy.tool.dir}/lib">
-						<include name="*.jar" />
-					</fileset>
-					<fileset dir="${sharedlib}">
-						<include name="**/*.jar" />
-					</fileset>
-				</path>
-
-		<echo>Deploying the Scratchie tool</echo>
-	
-		<java
-			classname="org.lamsfoundation.lams.tool.deploy.Deploy"
-			classpathref="deploy.classpath"
-			fork="true">
-				<arg file="${build.deploy}/deploy.xml"/>
-				<arg value="True"/> <!-- forcedb -->
-		</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>
-
-	<!-- begin navigation tasks *************************************************************************************-->
-	<target
-        name="_build"
-        depends="clean,init, compile-java, jar, build-war">
-		<echo>+------------------------------------------+</echo>
-		<echo>| built war file                           |</echo>
-		<echo>+------------------------------------------+</echo>
-	</target>
-
- 	<!-- end navigation tasks ***************************************************************************************-->
-	
-	<!-- Debug target: Explode tool to ear folder for debug use  -->
-	<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="explode-tool" depends="delete-exploded-tool-folder,deploy-tool" description="explode tool 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 -->
-		<!-- Don't explode jar file, becuase classes in jar will conflict with those same classes files in war -->
-		<!--<unjar src="${jboss.deploy}/${product}.jar" dest="${jboss.deploy}/${product}.war" />-->
-		<unjar src="${jboss.deploy}/temp-${product}.war" dest="${jboss.deploy}/${product}.war" />
-		<!-- delete war and jar files -->
-		<delete>
-			<fileset dir="${jboss.deploy}">
-			    <include name="temp-${product}.war"/>
-			 <!--   <include name="${product}.jar"/> -->
-			</fileset>
-		</delete>
-	
-	</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>
-	
-	<!-- Runs if jsp.precompile setting is set in lams_build/common.properties -->
-	<target name="jsp-precompile" if="jsp.precompile">
-		<!-- Work on a copy of web files, not originals-->
-		<echo>Copying web files</echo>
-		<delete dir="${build.war}" quiet="false"/>
-	 	<copy overwrite="yes" todir="${build.war}">
-			<fileset dir="${conf.web.dir}">
-				<include name="**"/>
-				<exclude name="WEB-INF/classes"/>
-			</fileset>
-	 	</copy>
-		
-		<!-- Define JSP compiler -->
-		<path id="jsp.precompile.classpath">
-			<path refid="project.classpath"/>
-			<pathelement location="${build.classes.java}"/>
-			<fileset dir="${jboss.home}/lib">
-				<include name="jboss-common-core.jar" />
-				<include name="jboss-logging-spi.jar" />
-			</fileset>
-			<fileset dir="${jboss.ear.deployers}/jbossweb.deployer">
-				<include name="*.jar" />
-			</fileset>
-	        <fileset dir="${jboss.ear.deploy}/jbossweb.sar">
-	            <include name="jbossweb.jar" />
-	        </fileset>
-		</path>
-		<taskdef classname="org.apache.jasper.JspC" name="jasper2" classpathref="jsp.precompile.classpath" />
-		
-		<!-- Generate Java files and put servlet mappings in web.xml file -->
-		<echo>Generating Java source from JSP pages</echo>
-		<jasper2 uriroot="${build.war}"
-			webXmlFragment="${build.war}/WEB-INF/generated_web.xml"
-			outputDir="${build.war}/WEB-INF/src"
-			package="${jsp.java.src.package}"
-			addWebXmlMappings="true" validateXml="false" failOnError="true"
-		/>
-		
-		<!-- Compile main Java source as some JSPs refer to it
-		Uncomment if you get "class not found" errors when precompiling JSPs
-		<antcall target="compile-java"/>
-		-->
-		
-		<!-- Compile Java files generated from JSPs -->
-		<echo>Compiling JSP classes</echo>
-		
-		<!-- Make src folder if it does not exist i.e. no JSPs were compiled in previous step -->
-		<mkdir dir="${build.war}/WEB-INF/src"/>
-		<mkdir dir="${build.war}/WEB-INF/classes"/>
-	    <javac destdir="${build.war}/WEB-INF/classes"
-	           optimize="on"
-	           debug="off" failonerror="true"
-	           srcdir="${build.war}/WEB-INF/src" 
-		  	   excludes="**/*.smap"
-	    	   classpathref="jsp.precompile.classpath">
-	      <include name="**" />
-	      <exclude name="tags/**" />
-	    </javac>
-		
-		<!-- Prepare files for WAR, exclude plain JSP and tags -->
-		<echo>Copying web scratchie</echo>
-		<copy todir="${build.war.assembly}">	
-			<fileset dir="${build.war}">
-				<include name="**"/>
-				<exclude name="WEB-INF/src/"/>
-				<exclude name="WEB-INF/web.xml"/>
-				<exclude name="**/*.java"/>
-				<exclude name="**/*.jsp"/>
-				<exclude name="**/*.tag"/>
-				<exclude name="**/*.tld"/>
-				<exclude name="**/.cvsignore"/>
-			</fileset>
-		</copy>
-	</target>
-					
-	<!-- Runs if jsp.precompile setting is NOT set in lams_build/common.properties 
-		 JSPs will be compiled at runtime, which is default behaviour allowing hotdeploy -->
-	<target name="jsp-plaincopy" unless="jsp.precompile">
-		<delete dir="${build.war}" quiet="false"/>
-		
-		<echo>Copying web scratchie</echo>
-	 	<copy todir="${build.war}">
-			<fileset dir="${conf.web.dir}">
-				<include name="WEB-INF/web.xml"/>
-			</fileset>
-	 	</copy>
-		
-	 	<copy todir="${build.war.assembly}">
-			<fileset dir="${conf.web.dir}">
-				<include name="**"/>
-				<exclude name="WEB-INF/web.xml"/>
-				<exclude name="WEB-INF/classes"/>
-				<exclude name="**/.cvsignore"/>
-			</fileset>
-	 	</copy>
-	</target>
-	<!-- end tasks **************************************************************************************************-->
-</project>
+</project>
\ No newline at end of file
Fisheye: Tag ded32af47a9de99cb3319fdd7461906323f7e293 refers to a dead (removed) revision in file `lams_tool_scratchie/conf/jar/META-INF/MANIFEST.MF'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag ded32af47a9de99cb3319fdd7461906323f7e293 refers to a dead (removed) revision in file `lams_tool_scratchie/conf/war/META-INF/MANIFEST.MF'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scratchie/conf/xdoclet/struts-plugins.xml
===================================================================
diff -u -r6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18 -rded32af47a9de99cb3319fdd7461906323f7e293
--- lams_tool_scratchie/conf/xdoclet/struts-plugins.xml	(.../struts-plugins.xml)	(revision 6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18)
+++ lams_tool_scratchie/conf/xdoclet/struts-plugins.xml	(.../struts-plugins.xml)	(revision ded32af47a9de99cb3319fdd7461906323f7e293)
@@ -5,9 +5,11 @@
 		value="/WEB-INF/struts/validator-rules.xml,/WEB-INF/validation.xml" />
 </plug-in>
 -->
+<!--
 <plug-in className="org.apache.struts.tiles.TilesPlugin">
 	<set-property property="definitions-config" value="/WEB-INF/tiles-defs.xml"/>
 </plug-in>
+-->
 <!--
 <plug-in className="net.sf.struts.saif.SAIFPlugin">
 	<set-property property="interceptor-config" value="/WEB-INF/interceptor-config.xml" />
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java
===================================================================
diff -u -r0ef117e7eca05b962210cb3b18eab1e39a6c57d1 -rded32af47a9de99cb3319fdd7461906323f7e293
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java	(.../ScratchieAnswerVisitDAO.java)	(revision 0ef117e7eca05b962210cb3b18eab1e39a6c57d1)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java	(.../ScratchieAnswerVisitDAO.java)	(revision ded32af47a9de99cb3319fdd7461906323f7e293)
@@ -33,6 +33,8 @@
     public ScratchieAnswerVisitLog getScratchieAnswerLog(Long itemUid, Long userId);
 
     public int getUserViewLogCount(Long sessionId, Long userId);
+    
+    int getUserViewLogCount(Long toolSessionId, Long userId, Long itemUid);
 
     /**
      * Return list which contains key pair which key is scratchie item uid, value is number view.
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java
===================================================================
diff -u -r0ef117e7eca05b962210cb3b18eab1e39a6c57d1 -rded32af47a9de99cb3319fdd7461906323f7e293
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java	(.../ScratchieAnswerVisitDAOHibernate.java)	(revision 0ef117e7eca05b962210cb3b18eab1e39a6c57d1)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java	(.../ScratchieAnswerVisitDAOHibernate.java)	(revision ded32af47a9de99cb3319fdd7461906323f7e293)
@@ -30,6 +30,7 @@
 import org.lamsfoundation.lams.tool.scratchie.dao.ScratchieAnswerVisitDAO;
 import org.lamsfoundation.lams.tool.scratchie.model.Scratchie;
 import org.lamsfoundation.lams.tool.scratchie.model.ScratchieAnswerVisitLog;
+import org.lamsfoundation.lams.tool.scratchie.model.ScratchieItem;
 import org.lamsfoundation.lams.tool.scratchie.model.ScratchieSession;
 
 public class ScratchieAnswerVisitDAOHibernate extends BaseDAOHibernate implements ScratchieAnswerVisitDAO {
@@ -42,6 +43,9 @@
 
     private static final String FIND_VIEW_COUNT_BY_USER = "select count(*) from "
 	    + ScratchieAnswerVisitLog.class.getName() + " as r where  r.sessionId=? and  r.user.userId =?";
+    
+    private static final String FIND_VIEW_COUNT_BY_USER_AND_ITEM = "select count(*) from "
+	    + ScratchieAnswerVisitLog.class.getName() + " as l where l.sessionId=? and l.user.userId =? and l.scratchieAnswer.scratchieItem.uid=?";
 
     private static final String FIND_SUMMARY = "select v.scratchieAnswer.uid, count(v.scratchieAnswer) from  "
 	    + ScratchieAnswerVisitLog.class.getName() + " as v , " + ScratchieSession.class.getName() + " as s, "
@@ -61,6 +65,13 @@
 	    return 0;
 	return ((Number) list.get(0)).intValue();
     }
+    
+    public int getUserViewLogCount(Long toolSessionId, Long userId, Long itemUid) {
+	List list = getHibernateTemplate().find(FIND_VIEW_COUNT_BY_USER_AND_ITEM, new Object[] { toolSessionId, userId, itemUid });
+	if (list == null || list.size() == 0)
+	    return 0;
+	return ((Number) list.get(0)).intValue();
+    }
 
     public Map<Long, Integer> getSummary(Long contentId) {
 
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswer.java
===================================================================
diff -u -r0ef117e7eca05b962210cb3b18eab1e39a6c57d1 -rded32af47a9de99cb3319fdd7461906323f7e293
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswer.java	(.../ScratchieAnswer.java)	(revision 0ef117e7eca05b962210cb3b18eab1e39a6c57d1)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswer.java	(.../ScratchieAnswer.java)	(revision ded32af47a9de99cb3319fdd7461906323f7e293)
@@ -45,6 +45,8 @@
     private boolean correct;
 
     private Integer orderId;
+    
+    private ScratchieItem scratchieItem;
 
     // ***********************************************
     // DTO fields:
@@ -105,7 +107,18 @@
     public void setOrderId(Integer orderId) {
         this.orderId = orderId;
     }
+    
+    /**
+     * @hibernate.many-to-one column="scratchie_item_uid" cascade="none"
+     */
+    public ScratchieItem getScratchieItem() {
+	return scratchieItem;
+    }
 
+    public void setScratchieItem(ScratchieItem scratchieItem) {
+	this.scratchieItem = scratchieItem;
+    }
+
     public void setScratched(boolean complete) {
 	this.scratched = complete;
     }
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
===================================================================
diff -u -r0ef117e7eca05b962210cb3b18eab1e39a6c57d1 -rded32af47a9de99cb3319fdd7461906323f7e293
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java	(.../IScratchieService.java)	(revision 0ef117e7eca05b962210cb3b18eab1e39a6c57d1)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java	(.../IScratchieService.java)	(revision ded32af47a9de99cb3319fdd7461906323f7e293)
@@ -162,6 +162,12 @@
      */
     void saveOrUpdateScratchieSession(ScratchieSession resSession);
 
+    /**
+     * Fill in scratchieItems with information about whether they were unraveled; and answers with information on their scratched.
+     * 
+     * @param scratchieItemList
+     * @param user
+     */
     void retrieveScratched(Collection<ScratchieItem> scratchieItemList, ScratchieUser user);
 
     void setAnswerAccess(Long scratchieItemUid, Long userId, Long sessionId);
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
===================================================================
diff -u -r6ade8791af29bde5c1e1b1aad674a9d23b69fb36 -rded32af47a9de99cb3319fdd7461906323f7e293
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision 6ade8791af29bde5c1e1b1aad674a9d23b69fb36)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision ded32af47a9de99cb3319fdd7461906323f7e293)
@@ -390,7 +390,6 @@
 
     public void retrieveScratched(Collection<ScratchieItem> items, ScratchieUser user) {
 	
-	
 	for (ScratchieItem item : items) {
 	    boolean isItemUnraveled = false;
 	    
@@ -408,7 +407,6 @@
 	    item.setUnraveled(isItemUnraveled);
 	}
 	
-	
     }
 
     public void setAnswerAccess(Long answerUid, Long userId, Long sessionId) {
@@ -470,10 +468,34 @@
 
 	    List<ScratchieUser> users = scratchieUserDao.getBySessionID(sessionId);
 	    for (ScratchieUser user : users) {
-		int attempts = scratchieAnswerVisitDao.getUserViewLogCount(sessionId, user.getUserId()); 
-		int mark = (attempts == 0) ? -1 : scratchie.getScratchieItems().size() - attempts + 1;
 		
-		user.setTotalAttempts(attempts);
+		int totalAttempts = scratchieAnswerVisitDao.getUserViewLogCount(sessionId, user.getUserId()); 
+		user.setTotalAttempts(totalAttempts);
+		
+		int mark = 0;
+		//for displaying purposes if there is no attemps we assign -1 which will be shown as "-"
+		if (totalAttempts == 0) {
+		    mark = -1;
+		    
+		} else {
+		    Set<ScratchieItem> items = scratchie.getScratchieItems();
+		    retrieveScratched(items, user);
+		    
+		    for (ScratchieItem item : items) {
+			//add mark only if item was unraveled
+			if (item.isUnraveled()) {
+			    int attempts = scratchieAnswerVisitDao.getUserViewLogCount(sessionId, user.getUserId(),
+				    item.getUid());
+			    mark += item.getAnswers().size() - attempts;
+
+			    // add extra point if needed
+			    if (scratchie.isExtraPoint() && (attempts == 1)) {
+				mark++;
+			    }
+			}
+		    }
+		}
+		
 		user.setMark(mark);
 	    }
 	    
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
===================================================================
diff -u -r6ade8791af29bde5c1e1b1aad674a9d23b69fb36 -rded32af47a9de99cb3319fdd7461906323f7e293
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java	(.../LearningAction.java)	(revision 6ade8791af29bde5c1e1b1aad674a9d23b69fb36)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java	(.../LearningAction.java)	(revision ded32af47a9de99cb3319fdd7461906323f7e293)
@@ -67,7 +67,7 @@
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
 /**
- * @author Steve.Ni
+ * @author Andrey Balan
  */
 public class LearningAction extends Action {
 
Fisheye: Tag ded32af47a9de99cb3319fdd7461906323f7e293 refers to a dead (removed) revision in file `lams_tool_scratchie/web/WEB-INF/tiles-defs.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag ded32af47a9de99cb3319fdd7461906323f7e293 refers to a dead (removed) revision in file `lams_tool_scratchie/web/layout/ frame.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag ded32af47a9de99cb3319fdd7461906323f7e293 refers to a dead (removed) revision in file `lams_tool_scratchie/web/layout/default.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scratchie/web/pages/monitoring/parts/advanceOptions.jsp
===================================================================
diff -u -r6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18 -rded32af47a9de99cb3319fdd7461906323f7e293
--- lams_tool_scratchie/web/pages/monitoring/parts/advanceOptions.jsp	(.../advanceOptions.jsp)	(revision 6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18)
+++ lams_tool_scratchie/web/pages/monitoring/parts/advanceOptions.jsp	(.../advanceOptions.jsp)	(revision ded32af47a9de99cb3319fdd7461906323f7e293)
@@ -11,6 +11,23 @@
 
 <div class="monitoring-advanced" id="advancedDiv" style="display:none">
 <table class="alternative-color">
+
+	<tr>
+		<td>
+			<fmt:message key="label.authoring.advanced.give.extra.point" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${sessionMap.scratchie.extraPoint == true}">
+					<fmt:message key="label.on" />
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="label.off" />
+				</c:otherwise>
+			</c:choose>	
+		</td>
+	</tr>
 	
 	<tr>
 		<td>
Index: lams_tool_scratchie/web/pages/monitoring/statistic.jsp
===================================================================
diff -u -r6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18 -rded32af47a9de99cb3319fdd7461906323f7e293
--- lams_tool_scratchie/web/pages/monitoring/statistic.jsp	(.../statistic.jsp)	(revision 6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18)
+++ lams_tool_scratchie/web/pages/monitoring/statistic.jsp	(.../statistic.jsp)	(revision ded32af47a9de99cb3319fdd7461906323f7e293)
@@ -37,7 +37,10 @@
 					${user.firstName} ${user.lastName}
 				</td>
 				<td>
-					${user.mark}
+					<c:choose>
+						<c:when test='${user.mark == -1}'>-</c:when> 
+						<c:otherwise>${user.mark}</c:otherwise>
+					</c:choose>
 				</td>
 			</tr>
 		</c:forEach>