[Tynstep-svn] r151 - in trunk/step-web-app: src/main/webapp src/main/webapp/WEB-INF war/WEB-INF

[ChrisBurrell at crosswire.org]

Author: ChrisBurrell
Date: 2010-07-14 09:08:51 -0700 (Wed, 14 Jul 2010)
New Revision: 151

Added:
   trunk/step-web-app/src/main/webapp/WEB-INF/
   trunk/step-web-app/src/main/webapp/WEB-INF/web.xml
Removed:
   trunk/step-web-app/war/WEB-INF/web.xml
Log:
moving web.xml

Copied: trunk/step-web-app/src/main/webapp/WEB-INF/web.xml (from rev 141, trunk/step-web-app/war/WEB-INF/web.xml)
===================================================================
--- trunk/step-web-app/src/main/webapp/WEB-INF/web.xml	                        (rev 0)
+++ trunk/step-web-app/src/main/webapp/WEB-INF/web.xml	2010-07-14 16:08:51 UTC (rev 151)
@@ -0,0 +1,39 @@
+<?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>
+  
+  	<!-- Remote logging agent for gwt-log -->
+	<servlet>
+		<servlet-name>remoteLoggerServiceImpl</servlet-name>
+		<servlet-class>com.allen_sauer.gwt.log.server.RemoteLoggerServiceImpl</servlet-class>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>remoteLoggerServiceImpl</servlet-name>
+		<url-pattern>/step/gwt-log</url-pattern>
+	</servlet-mapping>
+
+  
+  	<filter>
+		<filter-name>guiceFilter</filter-name>
+		<filter-class>com.google.inject.servlet.GuiceFilter</filter-class>
+	</filter>
+
+	<filter-mapping>
+		<filter-name>guiceFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
+	<listener>
+		<listener-class>com.tyndalehouse.step.web.server.guice.MyGuiceServletConfig</listener-class>
+	</listener>
+
+	<!-- Default page to serve -->
+	<welcome-file-list>
+		<welcome-file>Step.html</welcome-file>
+	</welcome-file-list>
+
+</web-app>

Deleted: trunk/step-web-app/war/WEB-INF/web.xml
===================================================================
--- trunk/step-web-app/war/WEB-INF/web.xml	2010-07-14 16:02:42 UTC (rev 150)
+++ trunk/step-web-app/war/WEB-INF/web.xml	2010-07-14 16:08:51 UTC (rev 151)
@@ -1,39 +0,0 @@
-<?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>
-  
-  	<!-- Remote logging agent for gwt-log -->
-	<servlet>
-		<servlet-name>remoteLoggerServiceImpl</servlet-name>
-		<servlet-class>com.allen_sauer.gwt.log.server.RemoteLoggerServiceImpl</servlet-class>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>remoteLoggerServiceImpl</servlet-name>
-		<url-pattern>/step/gwt-log</url-pattern>
-	</servlet-mapping>
-
-  
-  	<filter>
-		<filter-name>guiceFilter</filter-name>
-		<filter-class>com.google.inject.servlet.GuiceFilter</filter-class>
-	</filter>
-
-	<filter-mapping>
-		<filter-name>guiceFilter</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-
-	<listener>
-		<listener-class>com.tyndalehouse.step.web.server.guice.MyGuiceServletConfig</listener-class>
-	</listener>
-
-	<!-- Default page to serve -->
-	<welcome-file-list>
-		<welcome-file>Step.html</welcome-file>
-	</welcome-file-list>
-
-</web-app>