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

---
 webCM/src/ear/application.xml    |  2 +-
 webCM/src/web/WEB-INF/web.xml    | 21 +++++----
 webStore/src/ear/application.xml |  3 +-
 webStore/src/web/WEB-INF/web.xml | 73 +++++++++++++++++---------------
 4 files changed, 55 insertions(+), 44 deletions(-)

diff --git a/webCM/src/ear/application.xml b/webCM/src/ear/application.xml
index d43d828ae1..2b1fffa3f6 100644
--- a/webCM/src/ear/application.xml
+++ b/webCM/src/ear/application.xml
@@ -4,8 +4,8 @@
  @version $Id$
 -->
 <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>webCM</display-name>
 	<description>Adempiere Web CM</description>
+	<display-name>webCM</display-name>
 	<module>
 		<web>
 			<web-uri>adempiereWebCM.war</web-uri>
diff --git a/webCM/src/web/WEB-INF/web.xml b/webCM/src/web/WEB-INF/web.xml
index 811ccc5120..f2fa659803 100644
--- a/webCM/src/web/WEB-INF/web.xml
+++ b/webCM/src/web/WEB-INF/web.xml
@@ -24,45 +24,46 @@
 		</listener-class>
 	</listener>
 	<servlet>
-		<servlet-name>AdRedirector</servlet-name>
 		<display-name>Adempiere WebCM Ad Redirector</display-name>
+		<servlet-name>AdRedirector</servlet-name>
 		<servlet-class>org.compiere.cm.AdRedirector</servlet-class>
 	</servlet>
 	<servlet>
-		<servlet-name>Broadcast</servlet-name>
 		<display-name>Adempiere WebCM Broadcaster</display-name>
+		<servlet-name>Broadcast</servlet-name>
 		<servlet-class>org.compiere.cm.Broadcast</servlet-class>
 	</servlet>
 	<servlet>
-		<servlet-name>CacheService</servlet-name>
 		<display-name>Adempiere WebCM CacheService</display-name>
+		<servlet-name>CacheService</servlet-name>
 		<servlet-class>org.compiere.cm.cache.Service</servlet-class>
 	</servlet>
 	<servlet>
-		<servlet-name>Community</servlet-name>
 		<display-name>Adempiere WebCM Community Handler</display-name>
+		<servlet-name>Community</servlet-name>
 		<servlet-class>org.compiere.cm.Community</servlet-class>
 	</servlet>
 	<servlet>
-		<servlet-name>RequestServlet</servlet-name>
 		<display-name>Adempiere WebCM Request Handler</display-name>
+		<servlet-name>RequestServlet</servlet-name>
 		<servlet-class>org.compiere.cm.RequestServlet</servlet-class>
 	</servlet>	
 	<servlet>
-		<servlet-name>XMLBroadcast</servlet-name>
 		<display-name>Adempiere WebCM XML Broadcaster</display-name>
+		<servlet-name>XMLBroadcast</servlet-name>
 		<servlet-class>org.compiere.cm.XMLBroadcast</servlet-class>
 	</servlet>
 	<servlet>
-		<servlet-name>StageBroadcast</servlet-name>
 		<display-name>Adempiere WebCM Stage Broadcaster</display-name>
+		<servlet-name>StageBroadcast</servlet-name>
 		<servlet-class>org.compiere.cm.StageBroadcast</servlet-class>
 	</servlet>
 	<servlet>
-		<servlet-name>MediaBroadcast</servlet-name>
 		<display-name>Adempiere WebCM Media Broadcaster</display-name>
+		<servlet-name>MediaBroadcast</servlet-name>
 		<servlet-class>org.compiere.cm.MediaBroadcast</servlet-class>
 	</servlet>
+	
 	<servlet-mapping>
 		<servlet-name>AdRedirector</servlet-name>
 		<url-pattern>/AdRedirector</url-pattern>
@@ -98,15 +99,19 @@
 	<session-config>
 		<session-timeout>10</session-timeout>
 	</session-config>
+	
 	<welcome-file-list>
 		<welcome-file>Broadcast</welcome-file>
 	</welcome-file-list>
+	
 	<mime-mapping>
     	<extension>css</extension>
 	    <mime-type>text/css</mime-type>
   	</mime-mapping>
+	
 	<error-page>
 		<error-code>404</error-code>
 		<location>/</location>
 	</error-page>
+	
 </web-app>
diff --git a/webStore/src/ear/application.xml b/webStore/src/ear/application.xml
index 231078e6ce..3062c84161 100644
--- a/webStore/src/ear/application.xml
+++ b/webStore/src/ear/application.xml
@@ -4,8 +4,9 @@
  @version $Id: application.xml,v 1.2 2006/06/12 00:58:42 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>wstore</display-name>
 	<description>Adempiere Web Store</description>
+	<display-name>wstore</display-name>
+	
 	<module>
 		<java>AdempiereSLib.jar</java>
 	</module>
diff --git a/webStore/src/web/WEB-INF/web.xml b/webStore/src/web/WEB-INF/web.xml
index d544a2910e..7fb6185ae0 100644
--- a/webStore/src/web/WEB-INF/web.xml
+++ b/webStore/src/web/WEB-INF/web.xml
@@ -15,9 +15,9 @@
 		<param-value>0</param-value>
 	</context-param>
 	<filter>
-		<filter-name>WebStoreFilter</filter-name>
-		<display-name>Web Store Filter </display-name>
 		<description>Adempiere Web Store Filter</description>
+		<display-name>Web Store Filter </display-name>
+		<filter-name>WebStoreFilter</filter-name>
 		<filter-class>org.compiere.wstore.StoreFilter</filter-class>
 	</filter>
 	<filter-mapping>
@@ -25,170 +25,170 @@
 		<url-pattern>/*</url-pattern>
 	</filter-mapping>
 	<servlet>
-		<servlet-name>AdvertisementServlet</servlet-name>
 		<display-name>Web Store Advertisement</display-name>
+		<servlet-name>AdvertisementServlet</servlet-name>
 		<servlet-class>org.compiere.wstore.AdvertisementServlet</servlet-class>
 		<load-on-startup>3</load-on-startup>
 	</servlet>
 	<servlet>
-		<servlet-name>AssetServlet</servlet-name>
 		<display-name>Web Store Assets</display-name>
+		<servlet-name>AssetServlet</servlet-name>
 		<servlet-class>org.compiere.wstore.AssetServlet</servlet-class>
 		<load-on-startup>2</load-on-startup>
 	</servlet>
 	<servlet>
-		<servlet-name>BasketServlet</servlet-name>
 		<display-name>Web Basket Servlet</display-name>
+		<servlet-name>BasketServlet</servlet-name>
 		<servlet-class>org.compiere.wstore.BasketServlet</servlet-class>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 	<servlet>
-		<servlet-name>CheckOutServlet</servlet-name>
 		<display-name>Web CheckOut Servlet</display-name>
+		<servlet-name>CheckOutServlet</servlet-name>
 		<servlet-class>org.compiere.wstore.CheckOutServlet</servlet-class>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 	<servlet>
-		<servlet-name>Click</servlet-name>
 		<display-name>Adempiere Click</display-name>
+		<servlet-name>Click</servlet-name>
 		<servlet-class>org.compiere.wstore.Click</servlet-class>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 	<servlet>
-		<servlet-name>ExpenseServlet</servlet-name>
 		<display-name>Web Expense Report</display-name>
+		<servlet-name>ExpenseServlet</servlet-name>
 		<servlet-class>org.compiere.wstore.ExpenseServlet</servlet-class>
 		<load-on-startup>3</load-on-startup>
 	</servlet>
 	<servlet>
-		<servlet-name>Counter</servlet-name>
 		<display-name>Web Page Counter</display-name>
+		<servlet-name>Counter</servlet-name>
 		<servlet-class>org.compiere.wstore.Counter</servlet-class>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 	<servlet>
-		<servlet-name>InfoServlet</servlet-name>
 		<display-name>Web Store Interest Area Servlet</display-name>
+		<servlet-name>InfoServlet</servlet-name>
 		<servlet-class>org.compiere.wstore.InfoServlet</servlet-class>
 		<load-on-startup>2</load-on-startup>
 	</servlet>
 	<servlet>
-		<servlet-name>InvoiceServlet</servlet-name>
 		<display-name>Web Store Invoices</display-name>
+		<servlet-name>InvoiceServlet</servlet-name>
 		<servlet-class>org.compiere.wstore.InvoiceServlet</servlet-class>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 	<servlet>
-		<servlet-name>LocationServlet</servlet-name>
 		<display-name>Web Store Location Servlet</display-name>
+		<servlet-name>LocationServlet</servlet-name>
 		<servlet-class>org.compiere.wstore.LocationServlet</servlet-class>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
     <servlet>
+    	<display-name>Web User Login Servlet</display-name>
         <servlet-name>LoginServlet</servlet-name>
-        <display-name>Web User Login Servlet</display-name>
         <servlet-class>org.compiere.wstore.LoginServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
 	<servlet>
-		<servlet-name>NoteServlet</servlet-name>
 		<display-name>Web Notification</display-name>
+		<servlet-name>NoteServlet</servlet-name>
 		<servlet-class>org.compiere.wstore.NoteServlet</servlet-class>
 		<load-on-startup>3</load-on-startup>
 	</servlet>
 	<servlet>
-		<servlet-name>OrderServlet</servlet-name>
 		<display-name>Web Store Order</display-name>
+		<servlet-name>OrderServlet</servlet-name>
 		<servlet-class>org.compiere.wstore.OrderServlet</servlet-class>
 		<load-on-startup>2</load-on-startup>
 	</servlet>
 	<servlet>
-		<servlet-name>PaymentServlet</servlet-name>
 		<display-name>Web Store Payment Processing</display-name>
+		<servlet-name>PaymentServlet</servlet-name>
 		<servlet-class>org.compiere.wstore.PaymentServlet</servlet-class>
 		<load-on-startup>2</load-on-startup>
 	</servlet>
 	<servlet>
-		<servlet-name>ProductServlet</servlet-name>
 		<display-name>Web Product Search</display-name>
+		<servlet-name>ProductServlet</servlet-name>
 		<servlet-class>org.compiere.wstore.ProductServlet</servlet-class>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 	<servlet>
-		<servlet-name>RegistrationServlet</servlet-name>
 		<display-name>Web Registration Servlet</display-name>
+		<servlet-name>RegistrationServlet</servlet-name>
 		<servlet-class>org.compiere.wstore.RegistrationServlet</servlet-class>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 	<servlet>
-		<servlet-name>RequestServlet</servlet-name>
 		<display-name>Web Request Servlet</display-name>
+		<servlet-name>RequestServlet</servlet-name>
 		<servlet-class>org.compiere.wstore.RequestServlet</servlet-class>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 	<servlet>
-		<servlet-name>RfQServlet</servlet-name>
 		<display-name>Web RfQ Servlet</display-name>
+		<servlet-name>RfQServlet</servlet-name>
 		<servlet-class>org.compiere.wstore.RfQServlet</servlet-class>
 		<load-on-startup>2</load-on-startup>
 	</servlet>
 	<servlet>
-		<servlet-name>SearchServlet</servlet-name>
 		<display-name>Web Store Search Servlet</display-name>
+		<servlet-name>SearchServlet</servlet-name>
 		<servlet-class>org.compiere.wstore.SearchServlet</servlet-class>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
     <servlet>
+    	<display-name>Web User Update Servlet</display-name>
         <servlet-name>UpdateServlet</servlet-name>
-        <display-name>Web User Update Servlet</display-name>
         <servlet-class>org.compiere.wstore.UpdateServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
 	<servlet>
-		<servlet-name>WorkflowServlet</servlet-name>
 		<display-name>Web Workflow Servlet</display-name>
+		<servlet-name>WorkflowServlet</servlet-name>
 		<servlet-class>org.compiere.wstore.WorkflowServlet</servlet-class>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 	<servlet>
-		<servlet-name>Index</servlet-name>
 		<display-name>Web Index Page</display-name>
+		<servlet-name>Index</servlet-name>
 		<jsp-file>/index.jsp</jsp-file>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 	<servlet>
-		<servlet-name>Basket</servlet-name>
 		<display-name>Web Basket Page</display-name>
+		<servlet-name>Basket</servlet-name>
 		<jsp-file>/basket.jsp</jsp-file>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 	<servlet>
-		<servlet-name>Login</servlet-name>
 		<display-name>Web Login Page</display-name>
+		<servlet-name>Login</servlet-name>
 		<jsp-file>/login.jsp</jsp-file>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 	<servlet>
-		<servlet-name>Request</servlet-name>
 		<display-name>Web Request Page</display-name>
+		<servlet-name>Request</servlet-name>
 		<jsp-file>/request.jsp</jsp-file>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 	<servlet>
-		<servlet-name>Info</servlet-name>
 		<display-name>Web Info Page</display-name>
+		<servlet-name>Info</servlet-name>
 		<jsp-file>/info.jsp</jsp-file>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 	<servlet>
-		<servlet-name>EMailServlet</servlet-name>
 		<display-name>Web EMail Servlet</display-name>
+		<servlet-name>EMailServlet</servlet-name>
 		<servlet-class>org.compiere.wstore.EMailServlet</servlet-class>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 	<servlet>
-		<servlet-name>IssueReportServlet</servlet-name>
 		<display-name>Adempiere Issue Reporting</display-name>
+		<servlet-name>IssueReportServlet</servlet-name>
 		<servlet-class>org.compiere.wstore.IssueReportServlet</servlet-class>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
@@ -304,12 +304,20 @@
 		<servlet-name>IssueReportServlet</servlet-name>
 		<url-pattern>/issueReportServlet/*</url-pattern>
 	</servlet-mapping>
+	
 	<session-config>
 		<session-timeout>30</session-timeout>
 	</session-config>
+	
+	<mime-mapping>
+    	<extension>css</extension>
+	    <mime-type>text/css</mime-type>
+  	</mime-mapping>
+  	
 	<welcome-file-list>
 		<welcome-file>index.jsp</welcome-file>
 	</welcome-file-list>
+	
 	<taglib>
 		<taglib-uri>http://java.sun.com/jsp/jstl/core</taglib-uri>
 		<taglib-location>/WEB-INF/c.tld</taglib-location>
@@ -330,8 +338,5 @@
 		<taglib-uri>webStore.tld</taglib-uri>
 		<taglib-location>/WEB-INF/webStore.tld</taglib-location>
 	</taglib>
-	<mime-mapping>
-    	<extension>css</extension>
-	    <mime-type>text/css</mime-type>
-  	</mime-mapping>
+  	
 </web-app>