minor

weld · Mar 27, 2009 · 0d3587c · 0d3587c
1 parent 1eb37b9
commit 0d3587c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 44 deletions.
diff --git a/jsf2/WebContent/WEB-INF/faces-config.xml b/jsf2/WebContent/WEB-INF/faces-config.xml
diff --git a/jsf2/WebContent/WEB-INF/web.xml b/jsf2/WebContent/WEB-INF/web.xml
@@ -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>

diff --git a/jsf2/build.xml b/jsf2/build.xml
@@ -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>
+</project>
diff --git a/jsf2/pom.xml b/jsf2/pom.xml
@@ -43,35 +43,22 @@
          <scope>provided</scope>
       </dependency>
 
-      <dependency>
-        <groupId>com.sun.facelets</groupId>
-        <artifactId>jsf-facelets</artifactId>
-      </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>-->
+<!--         <scope>runtime</scope>-->
+<!--      </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>