[webbeans-commits] Webbeans SVN: r2228 - in examples/trunk/jsf2: WebContent/WEB-INF and 1 other directory.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-03-27 12:23:19 -0400 (Fri, 27 Mar 2009)
New Revision: 2228

Removed:
   examples/trunk/jsf2/WebContent/WEB-INF/faces-config.xml
Modified:
   examples/trunk/jsf2/WebContent/WEB-INF/web.xml
   examples/trunk/jsf2/build.xml
   examples/trunk/jsf2/pom.xml
Log:
minor

Deleted: examples/trunk/jsf2/WebContent/WEB-INF/faces-config.xml
===================================================================
--- examples/trunk/jsf2/WebContent/WEB-INF/faces-config.xml	2009-03-27 14:19:05 UTC (rev 2227)
+++ examples/trunk/jsf2/WebContent/WEB-INF/faces-config.xml	2009-03-27 16:23:19 UTC (rev 2228)
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<faces-config version="1.2"
-              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-facesconfig_1_2.xsd">
-    
-    <application>
-        <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
-    </application>
-
-</faces-config>

Modified: examples/trunk/jsf2/WebContent/WEB-INF/web.xml
===================================================================
--- examples/trunk/jsf2/WebContent/WEB-INF/web.xml	2009-03-27 14:19:05 UTC (rev 2227)
+++ examples/trunk/jsf2/WebContent/WEB-INF/web.xml	2009-03-27 16:23:19 UTC (rev 2228)
@@ -12,18 +12,12 @@
    <servlet>
       <servlet-name>Faces Servlet</servlet-name>
       <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
-      <load-on-startup>1</load-on-startup>
    </servlet>
 
    <servlet-mapping>
       <servlet-name>Faces Servlet</servlet-name>
       <url-pattern>*.jsf</url-pattern>
    </servlet-mapping>
-   
-   <context-param>
-      <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
-      <param-value>.xhtml</param-value>
-   </context-param>
 
    <session-config>
       <session-timeout>10</session-timeout>

Modified: examples/trunk/jsf2/build.xml
===================================================================
--- examples/trunk/jsf2/build.xml	2009-03-27 14:19:05 UTC (rev 2227)
+++ examples/trunk/jsf2/build.xml	2009-03-27 16:23:19 UTC (rev 2228)
@@ -1,7 +1,7 @@
 <project basedir="." name="Numberguess Example Build" default="restart">
 	
-	<property name="example.name" value="webbeans-numberguess" />
+	<property name="example.name" value="webbeans-numberguess-jsf2" />
 
 	<import file="../build.xml" />
 	
-</project>
\ No newline at end of file
+</project>

Modified: examples/trunk/jsf2/pom.xml
===================================================================
--- examples/trunk/jsf2/pom.xml	2009-03-27 14:19:05 UTC (rev 2227)
+++ examples/trunk/jsf2/pom.xml	2009-03-27 16:23:19 UTC (rev 2228)
@@ -43,35 +43,22 @@
          <scope>provided</scope>
       </dependency>
       
-      <dependency>
-        <groupId>com.sun.facelets</groupId>
-        <artifactId>jsf-facelets</artifactId>
-      </dependency>
+<!--      <dependency>-->
+<!--         <groupId>javax.el</groupId>-->
+<!--         <artifactId>el-ri</artifactId>-->
+<!--         <exclusions>-->
+<!--            <exclusion>-->
+<!--               <groupId>javax.el</groupId>-->
+<!--               <artifactId>el-api</artifactId>-->
+<!--            </exclusion>-->
+<!--         </exclusions>-->
+<!--         <scope>runtime</scope>-->
+<!--      </dependency>-->
       
-      <!-- <dependency>
-         <groupId>org.jboss.el</groupId>
-         <artifactId>jboss-el</artifactId>
-         <exclusions>
-            <exclusion>
-               <groupId>javax.el</groupId>
-               <artifactId>el-api</artifactId>
-            </exclusion>
-         </exclusions>
-      </dependency>-->
-      
       <dependency>
-         <groupId>javax.el</groupId>
-         <artifactId>el-ri</artifactId>
-         <exclusions>
-            <exclusion>
-               <groupId>javax.el</groupId>
-               <artifactId>el-api</artifactId>
-            </exclusion>
-         </exclusions>
-      </dependency>
-      <dependency>
       	<groupId>javax.annotation</groupId>
       	<artifactId>jsr250-api</artifactId>
+         <scope>provided</scope>
       </dependency>
       
    </dependencies>