Index: lams_build/conf/j2ee/application.xml
===================================================================
diff -u -r588f76faa14713e0a4dad8887c7683bd348f079b -r84af64052b65a5a8f91e42f58f03e8362c5eb3de
--- lams_build/conf/j2ee/application.xml	(.../application.xml)	(revision 588f76faa14713e0a4dad8887c7683bd348f079b)
+++ lams_build/conf/j2ee/application.xml	(.../application.xml)	(revision 84af64052b65a5a8f91e42f58f03e8362c5eb3de)
@@ -13,18 +13,6 @@
     </module>
     <module>
         <web>
-            <web-uri>lams-workspace.war</web-uri>
-            <context-root>/lams/workspace</context-root>
-	</web>
-    </module>
-    <module>
-        <web>
-            <web-uri>lams-authoring.war</web-uri>
-            <context-root>/lams/authoring</context-root>
-	</web>
-    </module>
-    <module>
-        <web>
             <web-uri>lams-monitoring.war</web-uri>
             <context-root>/lams/monitoring</context-root>
 	</web>
Index: lams_build/master-build.xml
===================================================================
diff -u -rd742c37aa170480fc716187ed61b6be9cd68a479 -r84af64052b65a5a8f91e42f58f03e8362c5eb3de
--- lams_build/master-build.xml	(.../master-build.xml)	(revision d742c37aa170480fc716187ed61b6be9cd68a479)
+++ lams_build/master-build.xml	(.../master-build.xml)	(revision 84af64052b65a5a8f91e42f58f03e8362c5eb3de)
@@ -50,10 +50,6 @@
 			target="build-jar" inheritAll="false" />
 		<ant antfile="../${lams_central}/build.xml" target="build-war"
 			inheritAll="false" />
-		<ant antfile="../${lams_workspace}/build.xml" target="build-war"
-			inheritAll="false" />
-		<ant antfile="../${lams_authoring}/build.xml"  target="build-war"
-			inheritAll="false"/>
 		<ant antfile="../${lams_learning}/build.xml" target="build-war" inheritAll="false"/>
 		<ant antfile="../${lams_monitoring}/build.xml"  target="build-war" inheritAll="false"/>
 		<!--
@@ -129,10 +125,7 @@
 				<include name="${lams.jar}" />
 				<include name="${lams-contentrepository.jar}" />
 				<include name="${lams-central.war}" />
-				<include name="${lams-workspace.jar}"/>
-				<include name="${lams-workspace.war}"/>
-				<include name="${lams-authoring.jar}"/>
-				<include name="${lams-authoring.war}"/>
+				<include name="${lams-central.jar}" />
 				<include name="${lams-monitoring.jar}"/>
 				<include name="${lams-monitoring.war}"/>
 				<include name="${lams-learning.jar}"/>
Index: lams_central/.classpath
===================================================================
diff -u -r9bef1de27d0d527d75191115a535bc2c4311ade9 -r84af64052b65a5a8f91e42f58f03e8362c5eb3de
--- lams_central/.classpath	(.../.classpath)	(revision 9bef1de27d0d527d75191115a535bc2c4311ade9)
+++ lams_central/.classpath	(.../.classpath)	(revision 84af64052b65a5a8f91e42f58f03e8362c5eb3de)
@@ -4,5 +4,7 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
 	<classpathentry kind="con" path="com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/>
+	<classpathentry sourcepath="/lams_common/src" kind="lib" path="/lams_build/lib/lams/lams.jar"/>
+	<classpathentry sourcepath="/lams_contentrepository" kind="lib" path="/lams_build/lib/lams/lams-contentrepository.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
Index: lams_central/.cvsignore
===================================================================
diff -u
--- lams_central/.cvsignore	(revision 0)
+++ lams_central/.cvsignore	(revision 84af64052b65a5a8f91e42f58f03e8362c5eb3de)
@@ -0,0 +1 @@
+build
Index: lams_central/.mymetadata
===================================================================
diff -u -r193ad7a6ec5ee05c612dc9a7230c5d281296f643 -r84af64052b65a5a8f91e42f58f03e8362c5eb3de
--- lams_central/.mymetadata	(.../.mymetadata)	(revision 193ad7a6ec5ee05c612dc9a7230c5d281296f643)
+++ lams_central/.mymetadata	(.../.mymetadata)	(revision 84af64052b65a5a8f91e42f58f03e8362c5eb3de)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-module
-   type="WEB"
-   name="lams_central"
-   id="myeclipse.1114057549859"
-   context-root="/lams_central"
-   j2ee-spec="1.3"
-   archive="lams_central.war">
-   <attributes>
-      <attribute name="webrootdir" value="web" />
-   </attributes>
+  type="WEB"
+  name="lams_central"
+  id="myeclipse.1114057549859"
+  context-root="/lams_central"
+  j2ee-spec="1.3"
+  archive="lams_central.war">
+  <attributes>
+    <attribute name="webrootdir" value="web" />
+  </attributes>
 </project-module>
 
Index: lams_central/build.properties
===================================================================
diff -u -r7e378fe35da44a2db37068a89a3cbcd06c0caae0 -r84af64052b65a5a8f91e42f58f03e8362c5eb3de
--- lams_central/build.properties	(.../build.properties)	(revision 7e378fe35da44a2db37068a89a3cbcd06c0caae0)
+++ lams_central/build.properties	(.../build.properties)	(revision 84af64052b65a5a8f91e42f58f03e8362c5eb3de)
@@ -23,19 +23,36 @@
 version=1.1
 
 # xdoclet properties
-xdoclet.version=1.2.2
+xdoclet.version=1.2.3
 	
 # path properties
 web=${basedir}/web
 webinf=${web}/WEB-INF
-	
-jboss.home=D:/jboss-3.2.6
+webinf.struts=${webinf}/struts
+
+jboss.home=D:/jboss-4.0.2
 jboss.deploy=${jboss.home}/server/default/deploy
 
+src=${basedir}/src
+src.java=${basedir}/src/java
+src.test.java=${basedir}/test/java
+test=${basedir}/test
+test.java=${basedir}/test/java
+
 build=${basedir}/build
 build.lib=${build}/lib
 	
 sharedlib=../lams_build/lib
 j2eelibs=C:/Program Files/MyEclipse/eclipse/plugins/com.genuitec.eclipse.j2eedt.core_3.8.4/data/libraryset/1.4
 
-database.driver.file=${sharedlib}/mysql/mysql-connector-java-3.1.7-bin.jar
\ No newline at end of file
+build=${basedir}/build
+build.classes=${build}/classes
+build.classes.java=${build.classes}/java
+build.lib=${build}/lib
+build.report=${build}/report
+build.test=${build}/test
+build.web=${build}/web
+	
+conf.dir=${basedir}/conf
+conf.xdoclet=${conf.dir}/xdoclet
+sessiontimeout=120
Index: lams_central/build.xml
===================================================================
diff -u -ra0a06e03eb6056ea710399b530a2c938b9a9bf1f -r84af64052b65a5a8f91e42f58f03e8362c5eb3de
--- lams_central/build.xml	(.../build.xml)	(revision a0a06e03eb6056ea710399b530a2c938b9a9bf1f)
+++ lams_central/build.xml	(.../build.xml)	(revision 84af64052b65a5a8f91e42f58f03e8362c5eb3de)
@@ -20,22 +20,13 @@
 
   http://www.gnu.org/licenses/gpl.txt 
 -->
+<project name="LAMS Central" basedir="." default="usage">
 
-<!-- 
-The DOCTYPE declaration declares the location of database-specific parts of the
-Ant build file. 
--->
-<!DOCTYPE project [
-	<!ENTITY properties SYSTEM "file:./properties.xml">
-]>
-
-<project name="LAMS" basedir="." default="usage">
-
 	<!-- import properties from the specified file -->
 	<property file="build.properties"/>
 
 	<path id="all-libs">
-		<fileset dir="${lib}">
+		<fileset dir="${sharedlib}">
 			<include name="**/*.jar"/>
 		</fileset>
 		<fileset dir="${sharedlib}">
@@ -61,6 +52,7 @@
 		<echo message="Among the available targets are:"/>
 		<echo message=""/>
 		<echo message="build-war  --> Make war archive for deployment"/>
+		<echo message="build-jar  --> Make jar archive for deployment"/>
 		<echo message="clean-build  --> Make war archive for deployment"/>
 		<echo message=""/>
 	</target>
@@ -72,25 +64,73 @@
 		<echo message="java.class.path = ${java.class.path}"/>
 	</target>
 
+	
 	<!-- ================================================================ -->
 	<!-- Preparations									                  -->
 	<!-- ================================================================ -->
 	<target name="preparedirs">
 		<mkdir dir="${build}"/>
 		<mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.classes}"/>
+		<mkdir dir="${build.test}"/>
+		<mkdir dir="${build.web}"/>				
 	</target>
 
 
-	<target name="clean-build" depends="preparedirs" description="removes all class files">
+	<target name="clean" depends="preparedirs" description="removes all class files">
+		<delete>
+			<fileset dir="${build.classes}"/>
+		</delete>
+		<mkdir dir="${build.classes}"/>	
 		<delete dir="${build.lib}"/>
 		<mkdir dir="${build.lib}"/>
 	</target>
 
+	
+	<!-- ================================================================ -->
+	<!-- Preparations									                  -->
+	<!-- ================================================================ -->
+	<target name="compile" depends="clean" description="compile java sources">
+ 	   <!--<property name="cp" refid="project.classpath"/>
+	   <echo message="Classpath is ${cp}"/> -->
+		<javac srcdir="${src.java}" compiler="modern"
+	         	 	destdir="${build.classes}" deprecation="on" debug="on">
+			<classpath>
+				<!--pathelement location="${build.classes.java}"/-->
+				<path refid="project.classpath"/>
+			</classpath>
+		</javac>
+		<!-- Spring files -->
+		<copy overwrite="yes" todir="${build.classes}/org/lamsfoundation/lams/authoring/">
+				<fileset dir="${src.java}/org/lamsfoundation/lams/authoring/">
+						<include name="*.xml"/>
+						<include name="*.properties"/>
+				</fileset>
+		</copy>
+	</target>
 
+	<target name="compile.test" depends="compile">
+		<javac destdir="${build.test}" compiler="modern">
+			<src path="${src.test.java}"/>
+			<classpath>
+				<path refid="project.classpath"/>
+			</classpath>
+		</javac>
+	</target>
+	
+	<target name="copyContext">
+		<copy overwrite="yes" todir="${build.web}">
+			<fileset dir="${web}">
+				<include name="**/*.xml"/>
+				<include name="**/*.tld"/>
+			</fileset>
+		</copy>
+	</target>
+	
 	<!-- = = = = = = = = = = = = = = = = = = = = = = = =  -->
 	<!-- Make the war archive  for deployment             -->
 	<!-- = = = = = = = = = = = = = = = = = = = = = = = =  -->
-	<target name="build-war" depends="clean-build" description="creates war file">
+	<target name="build-war" depends="webdoclet,build-jar" description="creates war file">
 		<delete file="${build.lib}/${product}.war"/>
 		<copy overwrite="yes" file="${web}/css/aqua.css" tofile="${web}/css/default.css"/>
 		<war warfile="${build.lib}/${product}.war" 
@@ -99,9 +139,11 @@
 				<include name="*.xml"/>
 				<include name="*.properties"/>
 				<include name="struts/*"/>
+				<include name="spring/*"/>					
 				<include name="jstl/*"/>
 				<exclude name="web.xml"/>
 			</webinf>
+			<classes dir="${build.classes}"/>				
 			<fileset dir="${web}">
 				<include name="*"/>
 				<include name="css/*"/>
@@ -114,5 +156,75 @@
 		</war>
 	</target>
 
+	<!-- ================================================================ -->
+	<!-- Make jar archive for deployment        		    	          -->
+	<!-- ================================================================ -->
+	<target name="build-jar" depends="compile,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}"/>
+			<fileset dir="${build.test}"/>
+			<fileset dir="${build.web}"/>
+		</jar>
+	</target>
+	<!-- =================================================================== -->
+	<!-- Run JUnit Tests                                                     -->
+	<!-- =================================================================== -->
+	<target name="test" depends="compile.test"> 
+			<mkdir dir="${build.report}"/>
+			<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.java}">
+						<include name="**/Test*.java"/>
+					</fileset>
+				</batchtest>			
+				<classpath>
+					<pathelement location="${build.classes}"/>
+					<pathelement location="${build.test}"/>
+					<pathelement location="${build.web}"/>
+					<path refid="project.classpath"/>
+				</classpath>			
+			</junit>
+	</target>
+		
+	<target name="test-report" depends="test">
+		<mkdir dir="${build.report}/html"/> 
+		<junitreport todir="${build.report}"> 
+			<fileset dir="${build.report}">
+				<include name="TEST-*.xml"/>
+			</fileset>
+			<report todir="${build.report}/html"/> 
+		</junitreport>
+	</target>
+
+	<!-- =================================================================== -->
+	<!-- Run xdoclet for hibernate                                           -->
+	<!-- =================================================================== -->
+	<taskdef name="webdoclet" classname="xdoclet.modules.web.WebDocletTask">
+	    <classpath refid="all-libs"/>
+	</taskdef>
+
+	<target name="webdoclet" depends="preparedirs">
+		<webdoclet destdir="${generated.java}" force="${xdoclet.force}">
+	         <fileset dir="${src.java}">
+	            <include name="**/*Action.java" />
+	         </fileset>
+
+	         <deploymentdescriptor 
+	         				servletspec="2.3" 
+	         				destdir="${webinf}"
+				         	mergedir="${conf.xdoclet}"
+	         				sessiontimeout="${sessiontimeout}"/>
+			
+	         <strutsconfigxml 
+	         				destdir="${webinf.struts}"
+	         				version="1.2" 
+	         				mergedir="${conf.xdoclet}"/>
+	     </webdoclet>
+	</target>
+		
+	
 </project>
 
Index: lams_central/web/WEB-INF/.cvsignore
===================================================================
diff -u
--- lams_central/web/WEB-INF/.cvsignore	(revision 0)
+++ lams_central/web/WEB-INF/.cvsignore	(revision 84af64052b65a5a8f91e42f58f03e8362c5eb3de)
@@ -0,0 +1 @@
+classes
Index: lams_central/web/WEB-INF/jboss-web.xml
===================================================================
diff -u -r193ad7a6ec5ee05c612dc9a7230c5d281296f643 -r84af64052b65a5a8f91e42f58f03e8362c5eb3de
--- lams_central/web/WEB-INF/jboss-web.xml	(.../jboss-web.xml)	(revision 193ad7a6ec5ee05c612dc9a7230c5d281296f643)
+++ lams_central/web/WEB-INF/jboss-web.xml	(.../jboss-web.xml)	(revision 84af64052b65a5a8f91e42f58f03e8362c5eb3de)
@@ -6,6 +6,6 @@
   <!-- This setting is only used when the war file is deployed directly -->
   <!-- within JBOSS. Usually it will be deployed as /lams, set in the ear's -->
   <!-- application.xml file. -->
-  <context-root>/</context-root>
+  <context-root>java:/jaas/LAMS</context-root>
 
 </jboss-web>
Index: lams_central/web/WEB-INF/web.xml
===================================================================
diff -u -r6c5caa649b8babd008c79ed43739a558d18f4576 -r84af64052b65a5a8f91e42f58f03e8362c5eb3de
--- lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 6c5caa649b8babd008c79ed43739a558d18f4576)
+++ lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 84af64052b65a5a8f91e42f58f03e8362c5eb3de)
@@ -1,33 +1,114 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
 
-<web-app>
+<web-app >
+ <!--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 
-	<!--
-		To use non XDoclet filters, create a filters.xml file that
-		contains the additional filters (eg Sitemesh) and place it in your
-		projects merge dir.  Don't include filter-mappings in this file,
-		include them in a file called filter-mappings.xml and put that in
-		the same directory.
-	-->
-	
-	<display-name>LAMS</display-name>
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
 
-	<description>Learning Activity Management System</description>
-	
-	<!--
-	  - Location of the Log4J config file, for initialization and refresh checks.
-	  - Applied by Log4jConfigListener.
-	-->
-	<context-param>
-		<param-name>log4jConfigLocation</param-name>
-		<param-value>/WEB-INF/log4j.xml</param-value>
-	</context-param>
+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.
 
-<!--  FCKEditor Configurations-->
+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., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
 
-<!--  File browser connector configuration -->
+http://www.gnu.org/licenses/gpl.txt
+-->
+<context-param>
+	<param-name>contextConfigLocation</param-name>
+	<param-value>
+				classpath:/org/lamsfoundation/lams/applicationContext.xml
+				classpath:/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
+				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
+				classpath:/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
+				classpath:/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
+	</param-value>
+</context-param>
+<listener>
+	<listener-class>
+		org.springframework.web.context.ContextLoaderListener
+	</listener-class>
+</listener>	
+
+    <!--
+    To use non XDoclet filters, create a filters.xml file that
+    contains the additional filters (eg Sitemesh) and place it in your
+    project's merge dir.  Don't include filter-mappings in this file,
+    include them in a file called filter-mappings.xml and put that in
+    the same directory.
+    -->
+
+    <!--
+    To use non XDoclet filter-mappings, create a filter-mappings.xml file that
+    contains the additional filter-mappings and place it in your
+    project's merge dir.
+    -->
+
+    <!--
+    To use non XDoclet listeners, create a listeners.xml file that
+    contains the additional listeners and place it in your
+    project's merge dir.
+    -->
+
+ <!--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+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., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+-->
+
 <servlet>
+	<servlet-name>context</servlet-name>
+	<servlet-class>org.springframework.web.context.ContextLoaderServlet</servlet-class>
+	<load-on-startup>1</load-on-startup>
+</servlet>
+
+<servlet>
+    <servlet-name>action</servlet-name>
+    <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
+    <init-param>
+      <param-name>config</param-name>
+      <param-value>/WEB-INF/struts/struts-config.xml</param-value>
+    </init-param>
+    <init-param>
+      <param-name>debug</param-name>
+      <param-value>999</param-value>
+    </init-param>
+    <init-param>
+      <param-name>detail</param-name>
+      <param-value>2</param-value>
+    </init-param>
+    <init-param>
+      <param-name>validate</param-name>
+      <param-value>true</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+</servlet>
+
+<servlet>
 		<servlet-name>Connector</servlet-name>
 		<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
 		<init-param>
@@ -41,141 +122,150 @@
 		<load-on-startup>1</load-on-startup>
 </servlet>
 
-<!--  Quick uploader Configuration -->
-<servlet>
-        <servlet-name>SimpleUploader</servlet-name>
-        <servlet-class>com.fredck.FCKeditor.uploader.SimpleUploaderServlet</servlet-class>
-        <init-param>
-                <param-name>baseDir</param-name>
-                <param-value>/UserFiles/</param-value>
-        </init-param>
-        <init-param>
-                <param-name>debug</param-name>
-                <param-value>true</param-value>
-        </init-param>
-        <init-param>
-                <param-name>enabled</param-name>
-                <param-value>false</param-value>
-        </init-param>
-        <init-param>
-                <param-name>AllowedExtensionsFile</param-name>
-                <param-value></param-value>
-        </init-param>
-        <init-param>
-                <param-name>DeniedExtensionsFile</param-name>
-                <param-value>php|php3|php5|phtml|asp|aspx|ascx|jsp|cfm|cfc|pl|bat|exe|dll|reg|cgi</param-value>
-        </init-param>
-        <init-param>
-                <param-name>AllowedExtensionsImage</param-name>
-                <param-value>jpg|gif|jpeg|png|bmp</param-value>
-        </init-param>
-        <init-param>
-                <param-name>DeniedExtensionsImage</param-name>
-                <param-value></param-value>
-        </init-param>
-        <init-param>
-                <param-name>AllowedExtensionsFlash</param-name>
-                <param-value>swf|fla</param-value>
-        </init-param>
-        <init-param>
-                <param-name>DeniedExtensionsFlash</param-name>
-                <param-value></param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-</servlet>
+  <!--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+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., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+-->
+
 <servlet-mapping>
-        <servlet-name>Connector</servlet-name>
-        <url-pattern>/fckeditor/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-	  <servlet-name>SimpleUploader</servlet-name>
-	  <url-pattern>/fckeditor/editor/filemanager/upload/simpleuploader</url-pattern>
-	</servlet-mapping>
+	<servlet-name>action</servlet-name>
+    <url-pattern>*.do</url-pattern>
+</servlet-mapping>
 
-<!--  End of FCKEditor Configurations -->
+<servlet-mapping>
+    <servlet-name>Connector</servlet-name>
+    <url-pattern>/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
+</servlet-mapping>
 
-	<!-- Struts Tag Library Defintions -->
-	<taglib>
-		<taglib-uri>/WEB-INF/struts-bean.tld</taglib-uri>
-		<taglib-location>
-			/WEB-INF/struts/struts-bean.tld
-		</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>/WEB-INF/struts-html.tld</taglib-uri>
-		<taglib-location>
-			/WEB-INF/struts/struts-html.tld
-		</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>/WEB-INF/struts-logic.tld</taglib-uri>
-		<taglib-location>
-			/WEB-INF/struts/struts-logic.tld
-		</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>/WEB-INF/struts-tiles.tld</taglib-uri>
-		<taglib-location>
-			/WEB-INF/struts/struts-tiles.tld
-		</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>/WEB-INF/struts-bean-el.tld</taglib-uri>
-		<taglib-location>
-			/WEB-INF/struts/struts-bean-el.tld
-		</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>/WEB-INF/struts-logic-el.tld</taglib-uri>
-		<taglib-location>
-			/WEB-INF/struts/struts-logic-el.tld
-		</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>/WEB-INF/struts-html-el.tld</taglib-uri>
-		<taglib-location>
-			/WEB-INF/struts/struts-html-el.tld
-		</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>/WEB-INF/struts-tiles-el.tld</taglib-uri>
-		<taglib-location>
-			/WEB-INF/struts/struts-tiles-el.tld
-		</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>/WEB-INF/struts-nested.tld</taglib-uri>
-		<taglib-location>
-			/WEB-INF/struts/struts-nested.tld
-		</taglib-location>
-	</taglib>
-	
-	<!-- JSTL Tag Library Defintions -->
-	<taglib>
-		<taglib-uri>http://java.sun.com/jstl/core</taglib-uri>
-		<taglib-location>/WEB-INF/jstl/c.tld</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>http://java.sun.com/jstl/core_rt</taglib-uri>
-		<taglib-location>/WEB-INF/jstl/c-rt.tld</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>http://java.sun.com/jstl/fmt</taglib-uri>
-		<taglib-location>/WEB-INF/jstl/fmt.tld</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>http://java.sun.com/jstl/fmt_rt</taglib-uri>
-		<taglib-location>/WEB-INF/jstl/fmt-rt.tld</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>http://java.sun.com/jstl/xml</taglib-uri>
-		<taglib-location>/WEB-INF/jstl/x.tld</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>http://java.sun.com/jstl/xml_rt</taglib-uri>
-		<taglib-location>/WEB-INF/jstl/x-rt.tld</taglib-location>
-	</taglib>
-	
+   <session-config>
+      <session-timeout>120</session-timeout>
+   </session-config>
 
+   <!--
+   To specify mime mappings, create a file named mime-mappings.xml, put it in your project's mergedir.
+   Organize mime-mappings.xml following this DTD slice:
+
+   <!ELEMENT mime-mapping (extension, mime-type)>
+   -->
+
+   <!--
+   To specify error pages, create a file named error-pages.xml, put it in your project's mergedir.
+   Organize error-pages.xml following this DTD slice:
+
+   <!ELEMENT error-page ((error-code | exception-type), location)>
+   -->
+
+<!--  ======================================================== -->	
+<!-- Struts Tag Library Descriptors -->
+<!--  ======================================================== -->	
+<taglib>
+    <taglib-uri>tags-bean</taglib-uri>
+    <taglib-location>/WEB-INF/struts/tlds/struts-bean.tld</taglib-location>
+</taglib>
+
+<taglib>
+    <taglib-uri>tags-html</taglib-uri>
+    <taglib-location>/WEB-INF/struts/tlds/struts-html.tld</taglib-location>
+</taglib>
+
+<taglib>
+    <taglib-uri>tags-logic</taglib-uri>
+    <taglib-location>/WEB-INF/struts/tlds/struts-logic.tld</taglib-location>
+</taglib>
+
+<taglib>
+    <taglib-uri>tags-tiles</taglib-uri>
+    <taglib-location>/WEB-INF/struts/tlds/struts-tiles.tld</taglib-location>
+</taglib>
+
+<taglib>
+    <taglib-uri>tags-bean-el</taglib-uri>
+    <taglib-location>/WEB-INF/struts/tlds/struts-bean-el.tld</taglib-location>
+</taglib>
+
+<taglib>
+    <taglib-uri>tags-html-el</taglib-uri>
+    <taglib-location>/WEB-INF/struts/tlds/struts-html-el.tld</taglib-location>
+</taglib>
+
+<taglib>
+    <taglib-uri>tags-logic-el</taglib-uri>
+    <taglib-location>/WEB-INF/struts/tlds/struts-logic-el.tld</taglib-location>
+</taglib>
+
+<taglib>
+    <taglib-uri>tags-tiles-el</taglib-uri>
+    <taglib-location>/WEB-INF/struts/tlds/struts-tiles-el.tld</taglib-location>
+</taglib>
+
+<taglib>
+    <taglib-uri>tags-c</taglib-uri>
+    <taglib-location>/WEB-INF/struts/tlds/c.tld</taglib-location>
+</taglib>
+<!--  ======================================================== -->	
+<!--  JSTL Tag Library -->
+<!--  ======================================================== -->	
+  <taglib>
+    <taglib-uri>http://java.sun.com/jstl/fmt</taglib-uri>
+    <taglib-location>/WEB-INF/JSTL/tlds/fmt.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>http://java.sun.com/jstl/fmt-rt</taglib-uri>
+    <taglib-location>/WEB-INF/JSTL/tlds/fmt-rt.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>http://java.sun.com/jstl/core</taglib-uri>
+    <taglib-location>/WEB-INF/JSTL/tlds/c.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>http://java.sun.com/jstl/core-rt</taglib-uri>
+    <taglib-location>/WEB-INF/JSTL/tlds/c-rt.tld</taglib-location>
+  </taglib>
+<!--  ======================================================== -->	
+<!--   Customized Tag Library -->
+<!--  ======================================================== -->	
+<taglib>
+    <taglib-uri>fck-editor</taglib-uri>
+    <taglib-location>/WEB-INF/fckeditor/tlds/FCKeditor.tld</taglib-location>
+</taglib>
+
+   <!--
+   To set up security settings for your web app, create a file named web-security.xml, put it in your project's mergedir.
+   Organize web-security.xml following this DTD slice:
+
+   <!ELEMENT security-constraint (display-name?, web-resource-collection+, auth-constraint?, user-data-constraint?)>
+   <!ELEMENT web-resource-collection (web-resource-name, description?, url-pattern*, http-method*)>
+   <!ELEMENT web-resource-name (#PCDATA)>
+   <!ELEMENT url-pattern (#PCDATA)>
+   <!ELEMENT http-method (#PCDATA)>
+   <!ELEMENT user-data-constraint (description?, transport-guarantee)>
+   <!ELEMENT transport-guarantee (#PCDATA)>
+
+   <!ELEMENT login-config (auth-method?, realm-name?, form-login-config?)>
+   <!ELEMENT auth-method (#PCDATA)>
+   <!ELEMENT realm-name (#PCDATA)>
+   <!ELEMENT form-login-config (form-login-page, form-error-page)>
+   <!ELEMENT form-login-page (#PCDATA)>
+   <!ELEMENT form-error-page (#PCDATA)>
+   -->
+
 </web-app>
Index: lams_central/web/index.jsp
===================================================================
diff -u
--- lams_central/web/index.jsp	(revision 0)
+++ lams_central/web/index.jsp	(revision 84af64052b65a5a8f91e42f58f03e8362c5eb3de)
@@ -0,0 +1,10 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head><title>Learning Design Details (Authoring)</title></head>
+<body>
+	<%
+		String str = (String)request.getSession().getAttribute("details");
+		out.println(str);
+	%>
+</body>
+</html>
\ No newline at end of file
Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u
Binary files differ
Index: lams_central/web/login.jsp
===================================================================
diff -u
--- lams_central/web/login.jsp	(revision 0)
+++ lams_central/web/login.jsp	(revision 84af64052b65a5a8f91e42f58f03e8362c5eb3de)
@@ -0,0 +1,50 @@
+
+<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%>
+<%
+String path = request.getContextPath();
+String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
+%>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+    <base href="<%=basePath%>">
+    
+    <title>My JSP 'MyJsp.jsp' starting page</title>
+    
+    <meta http-equiv="pragma" content="no-cache">
+    <meta http-equiv="cache-control" content="no-cache">
+    <meta http-equiv="expires" content="0">
+    <meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
+    <meta http-equiv="description" content="This is my page">
+    
+    <!--
+    <link rel="stylesheet" type="text/css" href="styles.css">
+    -->
+  </head>
+  
+  <body>
+   <form action="<%= response.encodeURL("j_security_check") %>" method="post" name="form1" id="form1">
+        <table width="150" height="87" border="0" align="center" cellpadding="0" cellspacing="0">
+          <tr>
+            <td width="51" align="right" class="smallText">Username</td>
+            <td width="1">&nbsp;</td>
+            <td width="90" align="right"> <input name="j_username" type="text" class="textField" size="15" /></td>
+          </tr>
+          <tr>
+            <td align="right" class="smallText">Password</td>
+            <td>&nbsp;</td>
+            <td align="right"> <input name="j_password" type="password" class="textField" size="15" AUTOCOMPLETE="off"/></td>
+          </tr>
+          <tr>
+            <td height="23" align="right">&nbsp;</td>
+            <td>&nbsp;</td>
+            <td align="right"> <input type="submit" value="Login"/>
+            </td>
+          </tr>
+        </table>
+       
+      </form>
+
+  </body>
+</html>