Author: dazarov Date: 2008-04-09 12:53:51 -0400 (Wed, 09 Apr 2008) New Revision: 7474 Modified: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.1/JSFBlankWithLibs/WebContent/WEB-INF/web.xml trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.1/JSFKickStartWithLibs/WebContent/WEB-INF/web.xml trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.1/JSFKickStartWithoutLibs/WebContent/WEB-INF/web.xml trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/struts/1.1/Blank/WebContent/WEB-INF/web.xml trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/struts/1.1/KickStart/WebContent/WEB-INF/web.xml trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/struts/1.2/Blank/WebContent/WEB-INF/web.xml trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/struts/1.2/KickStart/WebContent/WEB-INF/web.xml Log: http://jira.jboss.com/jira/browse/JBIDE-2034 Modified: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.1/JSFBlankWithLibs/WebContent/WEB-INF/web.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.1/JSFBlankWithLibs/WebContent/WEB-INF/web.xml 2008-04-09 16:52:23 UTC (rev 7473) +++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.1/JSFBlankWithLibs/WebContent/WEB-INF/web.xml 2008-04-09 16:53:51 UTC (rev 7474) @@ -4,6 +4,11 @@ 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/web-app_2_4.xsd"> +#elseif ($servlet_version == "2.5") +<web-app version="2.5" +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_2_5.xsd"> #else <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" Modified: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.1/JSFKickStartWithLibs/WebContent/WEB-INF/web.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.1/JSFKickStartWithLibs/WebContent/WEB-INF/web.xml 2008-04-09 16:52:23 UTC (rev 7473) +++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.1/JSFKickStartWithLibs/WebContent/WEB-INF/web.xml 2008-04-09 16:53:51 UTC (rev 7474) @@ -4,6 +4,11 @@ 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/web-app_2_4.xsd"> +#elseif ($servlet_version == "2.5") +<web-app version="2.5" +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_2_5.xsd"> #else <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" Modified: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.1/JSFKickStartWithoutLibs/WebContent/WEB-INF/web.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.1/JSFKickStartWithoutLibs/WebContent/WEB-INF/web.xml 2008-04-09 16:52:23 UTC (rev 7473) +++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.1/JSFKickStartWithoutLibs/WebContent/WEB-INF/web.xml 2008-04-09 16:53:51 UTC (rev 7474) @@ -4,6 +4,11 @@ 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/web-app_2_4.xsd"> +#elseif ($servlet_version == "2.5") +<web-app version="2.5" +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_2_5.xsd"> #else <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" Modified: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/struts/1.1/Blank/WebContent/WEB-INF/web.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/struts/1.1/Blank/WebContent/WEB-INF/web.xml 2008-04-09 16:52:23 UTC (rev 7473) +++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/struts/1.1/Blank/WebContent/WEB-INF/web.xml 2008-04-09 16:53:51 UTC (rev 7474) @@ -4,6 +4,11 @@ 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/web-app_2_4.xsd"> +#elseif ($servlet_version == "2.5") +<web-app version="2.5" +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_2_5.xsd"> #else <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" Modified: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/struts/1.1/KickStart/WebContent/WEB-INF/web.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/struts/1.1/KickStart/WebContent/WEB-INF/web.xml 2008-04-09 16:52:23 UTC (rev 7473) +++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/struts/1.1/KickStart/WebContent/WEB-INF/web.xml 2008-04-09 16:53:51 UTC (rev 7474) @@ -1,10 +1,14 @@ <?xml version="1.0" encoding="ISO-8859-1"?> - #if ($servlet_version == "2.4") <web-app version="2.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/web-app_2_4.xsd"> +#elseif ($servlet_version == "2.5") +<web-app version="2.5" +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_2_5.xsd"> #else <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" Modified: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/struts/1.2/Blank/WebContent/WEB-INF/web.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/struts/1.2/Blank/WebContent/WEB-INF/web.xml 2008-04-09 16:52:23 UTC (rev 7473) +++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/struts/1.2/Blank/WebContent/WEB-INF/web.xml 2008-04-09 16:53:51 UTC (rev 7474) @@ -1,10 +1,14 @@ <?xml version="1.0" encoding="ISO-8859-1"?> - #if ($servlet_version == "2.4") <web-app version="2.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/web-app_2_4.xsd"> +#elseif ($servlet_version == "2.5") +<web-app version="2.5" +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_2_5.xsd"> #else <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" Modified: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/struts/1.2/KickStart/WebContent/WEB-INF/web.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/struts/1.2/KickStart/WebContent/WEB-INF/web.xml 2008-04-09 16:52:23 UTC (rev 7473) +++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/struts/1.2/KickStart/WebContent/WEB-INF/web.xml 2008-04-09 16:53:51 UTC (rev 7474) @@ -1,10 +1,14 @@ <?xml version="1.0" encoding="ISO-8859-1"?> - #if ($servlet_version == "2.4") <web-app version="2.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/web-app_2_4.xsd"> +#elseif ($servlet_version == "2.5") +<web-app version="2.5" +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_2_5.xsd"> #else <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"