Index: lams_central/conf/xdoclet/taglibs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/xdoclet/taglibs.xml,v
diff -u -r1.1 -r1.2
--- lams_central/conf/xdoclet/taglibs.xml	31 Aug 2005 05:26:20 -0000	1.1
+++ lams_central/conf/xdoclet/taglibs.xml	19 Sep 2005 01:02:18 -0000	1.2
@@ -51,22 +51,22 @@
 <!--  ======================================================== -->	
   <taglib>
     <taglib-uri>http://java.sun.com/jstl/fmt</taglib-uri>
-    <taglib-location>/WEB-INF/JSTL/tlds/fmt.tld</taglib-location>
+    <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-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-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-location>/WEB-INF/jstl/tlds/c-rt.tld</taglib-location>
   </taglib>
 <!--  ======================================================== -->	
 <!--   Customized Tag Library -->
Index: lams_central/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/Attic/web.xml,v
diff -u -r1.7 -r1.8
--- lams_central/web/WEB-INF/web.xml	14 Sep 2005 06:52:56 -0000	1.7
+++ lams_central/web/WEB-INF/web.xml	19 Sep 2005 01:02:18 -0000	1.8
@@ -54,6 +54,9 @@
 	<listener-class>
  		org.lamsfoundation.lams.web.SessionListener
  	</listener-class>
+	<listener-class>
+	  org.lamsfoundation.lams.web.SharedSession
+	</listener-class>
 </listener>	
 
    <servlet>
@@ -240,22 +243,22 @@
 <!--  ======================================================== -->	
   <taglib>
     <taglib-uri>http://java.sun.com/jstl/fmt</taglib-uri>
-    <taglib-location>/WEB-INF/JSTL/tlds/fmt.tld</taglib-location>
+    <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-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-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-location>/WEB-INF/jstl/tlds/c-rt.tld</taglib-location>
   </taglib>
 <!--  ======================================================== -->	
 <!--   Customized Tag Library -->
@@ -265,31 +268,114 @@
     <taglib-location>/WEB-INF/fckeditor/tlds/FCKeditor.tld</taglib-location>
 </taglib>
 
-  <security-constraint>
-	<display-name>SecurityConstraint</display-name>
-	<web-resource-collection>
-		<web-resource-name>STK</web-resource-name>
-		<url-pattern>*.jsp</url-pattern>
-		<http-method>DELETE</http-method>
-		<http-method>GET</http-method>
-		<http-method>POST</http-method>
-		<http-method>PUT</http-method>
-	</web-resource-collection>
-	<auth-constraint>
+  	<!--  Security Constraint -->
+	<security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Secure Content</web-resource-name>
+    		<url-pattern>*.jsp</url-pattern>
+    		<url-pattern>*.html</url-pattern>
+    		<url-pattern>/index.jsp</url-pattern>
+    	</web-resource-collection>
+    	<auth-constraint>
+    		<role-name>LEARNER</role-name>
+    		<role-name>TEACHER</role-name>
+    		<role-name>STAFF</role-name>
+    		<role-name>AUTHOR</role-name>
+    		<role-name>ADMIN</role-name>
+    		<role-name>SYSADMIN</role-name>
+    	</auth-constraint>
+    </security-constraint>
+
+    <security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Authoring Update</web-resource-name>
+		    <url-pattern>/authoring.do</url-pattern>
+    	</web-resource-collection>
+    	<auth-constraint>
+    		<role-name>AUTHOR</role-name>
+    	</auth-constraint>
+    </security-constraint>
+    <security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Staff Content</web-resource-name>
+		    <url-pattern>/monitoring.do</url-pattern>
+    	</web-resource-collection>
+    	<auth-constraint>
+    		<role-name>STAFF</role-name>
+    	</auth-constraint>
+    </security-constraint>
+
+    <security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Adminstrator Content</web-resource-name>
+		    <url-pattern>/admin.do</url-pattern> 
+    	</web-resource-collection>
+    	<auth-constraint>
+    		<role-name>ADMIN</role-name>
+    	</auth-constraint>
+    </security-constraint>
+    <security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>LAMS System Adminstrator Content</web-resource-name>
+		    <url-pattern>/sysadmin.do</url-pattern> 
+    	</web-resource-collection>
+    	<auth-constraint>
+    		<role-name>SYSADMIN</role-name>
+    	</auth-constraint>
+    </security-constraint>
+	<!--  some combine role security setting -->
+    <security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Download Files</web-resource-name>
+		    <url-pattern>/download/</url-pattern>
+    	</web-resource-collection>
+    	<auth-constraint>
+    		<role-name>AUTHOR</role-name>
+    		<role-name>STAFF</role-name>
+    		<role-name>ADMIN</role-name>
+    		<role-name>SYSADMIN</role-name>
+    	</auth-constraint>
+    </security-constraint>
+
+	<!--  Login Configuration -->
+  	<login-config>
+   		<auth-method>FORM</auth-method>
+		<realm-name>LAMS</realm-name>
+   		<form-login-config>
+    		<form-login-page>/login.jsp</form-login-page>
+    		<form-error-page>/login.jsp?failed=y</form-error-page>
+   		</form-login-config>
+   	</login-config>
+    <!-- ======================================================== -->
+	<!--  Security Roles -->
+    <!-- ======================================================== -->
+	<security-role>
+		<description>Student</description>
+		<role-name>LEARNER</role-name>
+	</security-role>
+	<security-role>
+		<description>Student</description>
+		<role-name>TEACHER</role-name>
+	</security-role>
+
+	<security-role>
+		<description>Can create/modify a learning design</description>
+		<role-name>AUTHOR</role-name>
+	</security-role>
+
+	<security-role>
+		<description>Can running and monitoring a learning session</description>
+		<role-name>STAFF</role-name>
+	</security-role>
+
+	<security-role>
+		<description>Can add/remove users to the system, set up classes of users for sessions</description>
+		<role-name>ADMIN</role-name>
+	</security-role>
+
+	<security-role>
+		<description>Can add/remove users to the system, set up classes of users for sessions</description>
 		<role-name>SYSADMIN</role-name>
-	</auth-constraint>
-</security-constraint>
-<security-role>
-	<description>SYSADMIN</description>
-	<role-name>SYSADMIN</role-name>
-</security-role>	
-<login-config>
-	<auth-method>FORM</auth-method>
-	<realm-name>LAMS</realm-name>
-	<form-login-config>
-		<form-login-page>/login.jsp</form-login-page>
-		<form-error-page>/login.jsp?failed=y</form-error-page>
-	</form-login-config>
-</login-config>
+	</security-role>
 
 </web-app>