Index: lams_tool_nb/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/Attic/web.xml,v
diff -u -r1.6 -r1.7
--- lams_tool_nb/web/WEB-INF/web.xml	16 Aug 2005 00:46:18 -0000	1.6
+++ lams_tool_nb/web/WEB-INF/web.xml	31 Oct 2005 05:35:00 -0000	1.7
@@ -24,14 +24,16 @@
 		</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.
-    -->
+  <!--  <filter>
+    <filter-name>contentFilter</filter-name>
+    <filter-class>org.lamsfoundation.lams.web.filter.ResponseCaptureFilter</filter-class>
+</filter>
 
+<filter-mapping>
+    <filter-name>contentFilter</filter-name>
+    <url-pattern>/portfolioExport</url-pattern>
+</filter-mapping> -->
+
     <!--
     To use non XDoclet filter-mappings, create a filter-mappings.xml file that
     contains the additional filter-mappings and place it in your
@@ -86,12 +88,18 @@
     </servlet>
 <!--  The download servlet, reused from the content repository jar -->
 	<servlet>
-		<description>Instructions Download</description>
-		<display-name>Instructions Download</display-name>
 		<servlet-name>download</servlet-name>
+		<display-name>Instructions Download</display-name>
+		<description>Instructions Download</description>		
 		<servlet-class>org.lamsfoundation.lams.contentrepository.client.ToolDownload</servlet-class>
 	    <load-on-startup>3</load-on-startup>
 	</servlet>
+	<servlet>
+		<servlet-name>exportPortfolio</servlet-name>
+		<display-name>Export Portfolio</display-name>
+		<description>Export Portfolio</description>		
+		<servlet-class>org.lamsfoundation.lams.tool.noticeboard.web.NbExportServlet</servlet-class>
+	</servlet>
 
   	<servlet-mapping>
 		<servlet-name>action</servlet-name>
@@ -102,6 +110,10 @@
 		<servlet-name>download</servlet-name>
 		<url-pattern>/download/*</url-pattern>
   	</servlet-mapping>
+  	<servlet-mapping>
+		<servlet-name>exportPortfolio</servlet-name>
+		<url-pattern>/portfolioExport</url-pattern>
+  	</servlet-mapping>
 
    <session-config>
       <session-timeout>120</session-timeout>
@@ -114,38 +126,77 @@
    <!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:
+  <error-page>
+	<error-code>403</error-code>
+	<location>/403.html</location>
+</error-page> 
 
-   <!ELEMENT error-page ((error-code | exception-type), location)>
-   -->
-
   <!-- Struts Tag Library Descriptors -->
 
 <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:
+  	<!--  Security Constraint -->
+	<security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Secure Content</web-resource-name>
+			<url-pattern>/*</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>
 
-   <!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)>
+    <security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Authoring Update</web-resource-name>
+		    <url-pattern>/authoringv2.do</url-pattern>
+		    <url-pattern>/starter/authoring.do</url-pattern>
+		    <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>/starter/monitor.do</url-pattern>
+		    <url-pattern>/monitoring.do</url-pattern>		   
+    	</web-resource-collection>
+    	<auth-constraint>
+    		<role-name>STAFF</role-name>
+    	</auth-constraint>
+    </security-constraint>
 
-   <!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)>
-   -->
+	<!--  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-login-config>
+   	</login-config>
+
 </web-app>