X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fwebapp%2FWEB-INF%2Fweb.xml;h=96f44530581640addda3b6ca7d7263f377d511d6;hb=387bef406fe4b276473d4063c4d227fce6ff2e11;hp=67624786057d68abeabca6b6ea4ca4906a596630;hpb=8845e7fe6141ccc98fd070ee4e653941f6e60508;p=photos

diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 6762478..96f4453 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -1,98 +1,119 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <web-app xmlns="http://java.sun.com/xml/ns/javaee"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-	version="3.0">
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+         version="3.0">
 
-	<display-name>cdi</display-name>
+    <display-name>cdi</display-name>
 
-	<!--  
-	      There are three means to configure Wickets configuration mode and they are
-	      tested in the order given. 
-	      1) A system property: -Dwicket.configuration
-	      2) servlet specific <init-param>
-	      3) context specific <context-param>
-	      The value might be either "development" (reloading when templates change)
-	      or "deployment". If no configuration is found, "development" is the default.
-	-->
-	
-	<filter>
-		<filter-name>authentication</filter-name>
-		<filter-class>org.wamblee.photos.security.AuthenticationFilter</filter-class>
-		<init-param>
-			<param-name>loginpage</param-name>
-			<param-value>/login.jsp</param-value>
-		</init-param>
-		<!-- each authenticated user is assigned to the gruop ALL in the security realm configuration --> 
-		<init-param>
-			<param-name>role</param-name>
-			<param-value>ALL</param-value>
-		</init-param>
-		<!-- defines the resource URLs for which no authentication is required --> 
-		<init-param>
-			<param-name>resources</param-name>
-			<param-value>/resources</param-value>
-		</init-param>
-	</filter>
+    <!--
+          There are three means to configure Wickets configuration mode and they are
+          tested in the order given.
+          1) A system property: -Dwicket.configuration
+          2) servlet specific <init-param>
+          3) context specific <context-param>
+          The value might be either "development" (reloading when templates change)
+          or "deployment". If no configuration is found, "development" is the default.
+    -->
 
-	<filter>
-		<filter-name>photos</filter-name>
-		<filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
-		<init-param>
-			<param-name>applicationClassName</param-name>
-			<param-value>org.wamblee.photos.wicket.WicketApplication</param-value>
-		</init-param>
-		<init-param>
-			<param-name>configuration</param-name>
-			<param-value>development</param-value>
-		</init-param>
-	</filter>
+    <!-- The image sender servlet has the sole task of sending
+		images to the client, either a thumbnail or full image -->
+    <servlet>
+        <description>Servlet which sends the raw images.</description>
+        <display-name>ImageSender</display-name>
+        <servlet-name>ImageSender</servlet-name>
+        <servlet-class>org.wamblee.photos.servlet.ImageSender</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>ImageSender</servlet-name>
+        <url-pattern>/image/*</url-pattern>
+    </servlet-mapping>
+
+
+    <filter>
+        <filter-name>authentication</filter-name>
+        <filter-class>org.wamblee.photos.security.AuthenticationFilter</filter-class>
+        <init-param>
+            <param-name>loginpage</param-name>
+            <param-value>/login.jsp</param-value>
+        </init-param>
+        <!-- each authenticated user is assigned to the gruop ALL in the security realm configuration -->
+        <init-param>
+            <param-name>role</param-name>
+            <param-value>ALL</param-value>
+        </init-param>
+        <!-- defines the resource URLs for which no authentication is required -->
+        <init-param>
+            <param-name>resources</param-name>
+            <param-value>/resources</param-value>
+        </init-param>
+    </filter>
+
+    <filter>
+        <filter-name>photos</filter-name>
+        <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
+        <init-param>
+            <param-name>applicationClassName</param-name>
+            <param-value>org.wamblee.photos.wicket.WicketApplication</param-value>
+        </init-param>
+        <init-param>
+            <param-name>configuration</param-name>
+            <param-value>development</param-value>
+        </init-param>
+    </filter>
 
     <filter-mapping>
-    	<filter-name>authentication</filter-name>
-    	<url-pattern>/*</url-pattern>
+        <filter-name>authentication</filter-name>
+        <url-pattern>/*</url-pattern>
     </filter-mapping>
-	<filter-mapping>
-		<filter-name>photos</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-	
-	<security-constraint>
-		<web-resource-collection>
-			<web-resource-name>resources</web-resource-name>
-			<url-pattern>/resources/*</url-pattern>
-		</web-resource-collection>
-	</security-constraint>
-	<security-constraint>
-		<web-resource-collection>
-			<web-resource-name>securedaccess</web-resource-name>
-			<url-pattern>/*</url-pattern>
-		</web-resource-collection>
-		<auth-constraint>
-			<role-name>ALL</role-name>
-			<role-name>users</role-name>
-		</auth-constraint>
-	</security-constraint>
-	
-	<login-config>
-		<auth-method>FORM</auth-method>
-		<realm-name>PhotoXChangeRealm</realm-name>
-		<form-login-config>
-			<form-login-page>/login.jsp</form-login-page>
-			<form-error-page>/loginError.jsp</form-error-page>
-		</form-login-config>
-	</login-config>
-	
-	<session-config>
-		<session-timeout>10</session-timeout>
-	</session-config>
-	
-	<welcome-file-list>
-		<welcome-file>login.jsp</welcome-file>
-	</welcome-file-list>
-	
-	<security-role>
-		<role-name>ALL</role-name>
-	</security-role>
-	
+    <filter-mapping>
+        <filter-name>photos</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+    <security-constraint>
+        <web-resource-collection>
+            <web-resource-name>resources</web-resource-name>
+            <url-pattern>/resources/*</url-pattern>
+        </web-resource-collection>
+    </security-constraint>
+    <security-constraint>
+        <web-resource-collection>
+            <web-resource-name>securedaccess</web-resource-name>
+            <url-pattern>/*</url-pattern>
+        </web-resource-collection>
+        <auth-constraint>
+            <role-name>ALL</role-name>
+            <role-name>users</role-name>
+        </auth-constraint>
+    </security-constraint>
+
+    <login-config>
+        <auth-method>FORM</auth-method>
+        <realm-name>PhotoXChangeRealm</realm-name>
+        <form-login-config>
+            <form-login-page>/login.jsp</form-login-page>
+            <form-error-page>/loginError.jsp</form-error-page>
+        </form-login-config>
+    </login-config>
+
+    <error-page>
+        <error-code>404</error-code>
+        <!-- view will redirect to login if the user is not logged in -->
+        <location>/404.jsp</location>
+    </error-page>
+
+    <session-config>
+        <session-timeout>10</session-timeout>
+    </session-config>
+
+    <welcome-file-list>
+        <welcome-file>login.jsp</welcome-file>
+    </welcome-file-list>
+
+    <security-role>
+        <role-name>ALL</role-name>
+    </security-role>
+
 </web-app>