[weld-commits] Weld SVN: r6432 - archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/main/webapp/WEB-INF.

[weld-commits at lists.jboss.org]

Author: dan.j.allen
Date: 2010-06-15 01:27:14 -0400 (Tue, 15 Jun 2010)
New Revision: 6432

Modified:
   archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
Log:
switch to 3.0
remove unnecessary ref


Modified: archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
===================================================================
--- archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml	2010-06-15 05:25:21 UTC (rev 6431)
+++ archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml	2010-06-15 05:27:14 UTC (rev 6432)
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-   <!--
-      Uncomment if you're using Glassfish. JBoss 6.0.0.M1 doesn't yet support Servlet 3.0. This is anticipated to be
-      fixed very soon.
-   -->
-   <!--
-      <web-app version="3.0" 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">
-   -->
-<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<web-app version="3.0" 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">
+      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+
+   <!-- This is an optional parameter, but it makes troubleshooting errors much easier -->
+   <!-- You should delete it before final deployment -->
+   <context-param>
+      <param-name>javax.faces.PROJECT_STAGE</param-name>
+      <param-value>Development</param-value>
+   </context-param>
+
    <!-- Activate the JSF 2.0 servlet -->
    <servlet>
       <servlet-name>Faces Servlet</servlet-name>
@@ -19,22 +19,10 @@
       <load-on-startup>1</load-on-startup>
    </servlet>
 
-   <!-- Tell the context which URLs to process as facelets.  -->
+   <!-- Tell the context which URLs to process with JSF -->
    <servlet-mapping>
       <servlet-name>Faces Servlet</servlet-name>
       <url-pattern>*.jsf</url-pattern>
    </servlet-mapping>
 
-   <!-- This is an optional parameter, but it makes troubleshooting errors much easier.  -->
-   <!-- You may want to delete it before final deployment -->
-   <context-param>
-      <param-name>javax.faces.PROJECT_STAGE</param-name>
-      <param-value>Development</param-value>
-   </context-param>
-
-   <persistence-unit-ref>
-      <persistence-unit-ref-name>widgets/pu</persistence-unit-ref-name>
-      <persistence-unit-name>widgets</persistence-unit-name>
-   </persistence-unit-ref>
-
 </web-app>