From cc6696bcf1ef6c84226fe12bb703e34cc81471d5 Mon Sep 17 00:00:00 2001
From: trifonnt <devnull@localhost>
Date: Thu, 2 Oct 2008 08:09:31 +0000
Subject: [PATCH] avoid warnings. make it compatible with web-app dtd.

---
 serverApps/src/ear/application.bak | 15 -----------
 serverApps/src/ear/application.xml |  2 +-
 serverApps/src/web/WEB-INF/web.xml | 42 +++++++++++++++---------------
 serverRoot/src/ear/application.xml |  2 +-
 serverRoot/src/web/WEB-INF/web.xml | 12 ++++-----
 5 files changed, 29 insertions(+), 44 deletions(-)
 delete mode 100755 serverApps/src/ear/application.bak

diff --git a/serverApps/src/ear/application.bak b/serverApps/src/ear/application.bak
deleted file mode 100755
index 9ec278c5c3..0000000000
--- a/serverApps/src/ear/application.bak
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"  encoding="UTF-8"?>
-<!--
- Copyright (C) 1999-2005 Jorg Janke ComPiere, Inc.
- @version $Id: application.xml,v 1.2 2006/06/12 00:58:57 jjanke Exp $
--->
-<application version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
-	<display-name>adempiereApps</display-name>
-	<description>Adempiere HTML Application</description>
-	<module>
-		<web>
-			<web-uri>AdempiereApps.war</web-uri>
-			<context-root>/adempiere</context-root>
-		</web>
-	</module>
-</application>
diff --git a/serverApps/src/ear/application.xml b/serverApps/src/ear/application.xml
index 7e2ef159ba..ef49429873 100644
--- a/serverApps/src/ear/application.xml
+++ b/serverApps/src/ear/application.xml
@@ -4,8 +4,8 @@
  @version $Id: application.xml,v 1.2 2006/06/12 00:58:57 jjanke Exp $
 -->
 <application version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
-	<display-name>adempiereApps</display-name>
 	<description>Adempiere HTML Application</description>
+	<display-name>adempiereApps</display-name>
 	<module>
 		<java>AdempiereSLib.jar</java>
 	</module>
diff --git a/serverApps/src/web/WEB-INF/web.xml b/serverApps/src/web/WEB-INF/web.xml
index 028b58ea73..c44bf99a60 100644
--- a/serverApps/src/web/WEB-INF/web.xml
+++ b/serverApps/src/web/WEB-INF/web.xml
@@ -15,8 +15,8 @@
 		<param-value>1</param-value>
 	</context-param>
 	<filter>
-		<filter-name>WFilter</filter-name>
 		<display-name>Adempiere Web Filter</display-name>
+		<filter-name>WFilter</filter-name>
 		<filter-class>org.compiere.www.WFilter</filter-class>
 		<init-param>
 			<param-name>Timing</param-name>
@@ -28,91 +28,91 @@
 		<url-pattern>/*</url-pattern>
 	</filter-mapping>
 	<servlet>
-		<servlet-name>WAccount</servlet-name>
 		<display-name>Adempiere Account</display-name>
+		<servlet-name>WAccount</servlet-name>
 		<servlet-class>org.compiere.www.WAccount</servlet-class>
 	</servlet>
 	<servlet>
-		<servlet-name>WCounter</servlet-name>
 		<display-name>Adempiere Counter</display-name>
+		<servlet-name>WCounter</servlet-name>
 		<servlet-class>org.compiere.wstore.Counter</servlet-class>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 	<servlet>
-		<servlet-name>WFieldUpdate</servlet-name>
 		<display-name>Adempiere Field Update</display-name>
+		<servlet-name>WFieldUpdate</servlet-name>
 		<servlet-class>org.compiere.www.WFieldUpdate</servlet-class>
 	</servlet>
 	<servlet>
-		<servlet-name>WLocation</servlet-name>
 		<display-name>Adempiere Location</display-name>
+		<servlet-name>WLocation</servlet-name>
 		<servlet-class>org.compiere.www.WLocation</servlet-class>
 	</servlet>
 	<servlet>
-		<servlet-name>WLogin</servlet-name>
 		<display-name>Adempiere Login</display-name>
+		<servlet-name>WLogin</servlet-name>
 		<servlet-class>org.compiere.www.WLogin</servlet-class>
 		<load-on-startup>2</load-on-startup>
 	</servlet>
 	<servlet>
-		<servlet-name>WLookup</servlet-name>
 		<display-name>Adempiere Lookup</display-name>
+		<servlet-name>WLookup</servlet-name>
 		<servlet-class>org.compiere.www.WLookup</servlet-class>
 	</servlet>
 	<servlet>
-		<servlet-name>WMenu</servlet-name>
 		<display-name>Adempiere Menu</display-name>
+		<servlet-name>WMenu</servlet-name>
 		<servlet-class>org.compiere.www.WMenu</servlet-class>
 	</servlet>
 	<servlet>
-		<servlet-name>WProcess</servlet-name>
 		<display-name>Adempiere Process</display-name>
+		<servlet-name>WProcess</servlet-name>
 		<servlet-class>org.compiere.www.WProcess</servlet-class>
 	</servlet>
 	<servlet>
-		<servlet-name>WReport</servlet-name>
 		<display-name>Adempiere Report</display-name>
+		<servlet-name>WReport</servlet-name>
 		<servlet-class>org.compiere.www.WReport</servlet-class>
 	</servlet>
 	<servlet>
-		<servlet-name>WChat</servlet-name>
 		<display-name>Adempiere Chat</display-name>
+		<servlet-name>WChat</servlet-name>
 		<servlet-class>org.compiere.www.WChat</servlet-class>
 	</servlet>
 	<servlet>
-		<servlet-name>WValuePreference</servlet-name>
 		<display-name>Adempiere Value Preference</display-name>
+		<servlet-name>WValuePreference</servlet-name>
 		<servlet-class>org.compiere.www.WValuePreference</servlet-class>
 	</servlet>
 	<servlet>
-		<servlet-name>WZoom</servlet-name>
 		<display-name>Adempiere Zoom</display-name>
+		<servlet-name>WZoom</servlet-name>
 		<servlet-class>org.compiere.www.WZoom</servlet-class>
 	</servlet>
 	<servlet>
-		<servlet-name>WHelp</servlet-name>
 		<display-name>Adempiere Help</display-name>
+		<servlet-name>WHelp</servlet-name>
 		<servlet-class>org.compiere.www.WHelp</servlet-class>
 	</servlet>
 	<servlet>
-		<servlet-name>WAttachment</servlet-name>
 		<display-name>Adempiere Attachment</display-name>
+		<servlet-name>WAttachment</servlet-name>
 		<servlet-class>org.compiere.www.WAttachment</servlet-class>
 	</servlet>
 	<servlet>
-		<servlet-name>WRequest</servlet-name>
 		<display-name>Web Requests</display-name>
+		<servlet-name>WRequest</servlet-name>
 		<servlet-class>org.compiere.wstore.RequestServlet</servlet-class>
 	</servlet>
 	<servlet>
-		<servlet-name>WStart</servlet-name>
 		<display-name>Adempiere Start</display-name>
+		<servlet-name>WStart</servlet-name>
 		<servlet-class>org.compiere.www.WStart</servlet-class>
 		<load-on-startup>2</load-on-startup>
 	</servlet>
 	<servlet>
-		<servlet-name>WStatus</servlet-name>
 		<display-name>Adempiere Status - first to load</display-name>
+		<servlet-name>WStatus</servlet-name>
 		<servlet-class>org.compiere.www.WStatus</servlet-class>
 		<init-param>
 			<param-name>StatusInfo</param-name>
@@ -121,18 +121,18 @@
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 	<servlet>
-		<servlet-name>WTask</servlet-name>
 		<display-name>Adempiere Task</display-name>
+		<servlet-name>WTask</servlet-name>
 		<servlet-class>org.compiere.www.WTask</servlet-class>
 	</servlet>
 	<servlet>
-		<servlet-name>WWindow</servlet-name>
 		<display-name>Adempiere Application Window</display-name>
+		<servlet-name>WWindow</servlet-name>
 		<servlet-class>org.compiere.www.WWindow</servlet-class>
 	</servlet>
 	<servlet>
-		<servlet-name>WWorkflow</servlet-name>
 		<display-name>Adempiere Workflow</display-name>
+		<servlet-name>WWorkflow</servlet-name>
 		<servlet-class>org.compiere.www.WWorkflow</servlet-class>
 	</servlet>
 	<servlet-mapping>
diff --git a/serverRoot/src/ear/application.xml b/serverRoot/src/ear/application.xml
index 21074ce959..d1adbd356f 100644
--- a/serverRoot/src/ear/application.xml
+++ b/serverRoot/src/ear/application.xml
@@ -4,8 +4,8 @@
  @version $Id: application.xml,v 1.3 2006/06/12 00:59:05 jjanke Exp $
 -->
 <application version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
-	<display-name>adempiereRoot</display-name>
 	<description>Adempiere Root</description>
+	<display-name>adempiereRoot</display-name>
 	<module>
 		<java>AdempiereSLib.jar</java>
 	</module>
diff --git a/serverRoot/src/web/WEB-INF/web.xml b/serverRoot/src/web/WEB-INF/web.xml
index bfa8a51a7e..1a2841df1e 100644
--- a/serverRoot/src/web/WEB-INF/web.xml
+++ b/serverRoot/src/web/WEB-INF/web.xml
@@ -11,8 +11,8 @@
 		<param-value>1</param-value>
 	</context-param>
 	<filter>
-		<filter-name>AdempiereMonitorFilter</filter-name>
 		<display-name>Adempiere Monitor Filter</display-name>
+		<filter-name>AdempiereMonitorFilter</filter-name>
 		<filter-class>org.compiere.web.AdempiereMonitorFilter</filter-class>
 	</filter>
 	<filter-mapping>
@@ -20,8 +20,8 @@
 		<url-pattern>/adempiereMonitor/*</url-pattern>
 	</filter-mapping>
 	<servlet>
-		<servlet-name>JnlpDownloadServlet</servlet-name>
 		<display-name>JNLP Download Servlet</display-name>
+		<servlet-name>JnlpDownloadServlet</servlet-name>
 		<servlet-class>jnlp.sample.servlet.JnlpDownloadServlet</servlet-class>
 		<init-param>
 			<param-name>logLevel</param-name>
@@ -30,15 +30,15 @@
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 	<servlet>
-		<servlet-name>StatusInfo</servlet-name>
-		<display-name>Server Status</display-name>
 		<description>Adempiere Server Status Info</description>
+		<display-name>Server Status</display-name>
+		<servlet-name>StatusInfo</servlet-name>
 		<servlet-class>org.compiere.web.StatusInfo</servlet-class>
 	</servlet>
 	<servlet>
-		<servlet-name>AdempiereMonitor</servlet-name>
-		<display-name>Adempiere Monitor</display-name>
 		<description>Adempiere Server Monitor</description>
+		<display-name>Adempiere Monitor</display-name>
+		<servlet-name>AdempiereMonitor</servlet-name>
 		<servlet-class>org.compiere.web.AdempiereMonitor</servlet-class>
 		<load-on-startup>1</load-on-startup>
 	</servlet>