[jboss-cvs] JBossAS SVN: r77431 - in trunk/testsuite/src: resources/web/WEB-INF and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: emuckenhuber
Date: 2008-08-25 10:03:12 -0400 (Mon, 25 Aug 2008)
New Revision: 77431

Modified:
   trunk/testsuite/src/main/org/jboss/test/jsf/webapp/InjectionBean.java
   trunk/testsuite/src/resources/web/WEB-INF/jsftest-web.xml
Log:
[JBAS-4399] update jsf integration tests

Modified: trunk/testsuite/src/main/org/jboss/test/jsf/webapp/InjectionBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jsf/webapp/InjectionBean.java	2008-08-25 14:02:09 UTC (rev 77430)
+++ trunk/testsuite/src/main/org/jboss/test/jsf/webapp/InjectionBean.java	2008-08-25 14:03:12 UTC (rev 77431)
@@ -22,7 +22,6 @@
 
 package org.jboss.test.jsf.webapp;
 
-import java.util.Map;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.annotation.Resource;
@@ -64,7 +63,6 @@
         return this.datasourceInjected;
     }
 
-    // TODO: test this annotation on a private method
     @PostConstruct
     private void testPostConstruct() {
         this.postConstructCalled = true;
@@ -99,7 +97,7 @@
         this.mySessionBean.setPreDestroyCalled(true);
     }
     
-    @Resource(name="java:/DefaultDS")
+    @Resource(name="defaultDS", mappedName="java:/DefaultDS")
     public void setDefaultDS(DataSource dataSource) {
         this.defaultDS = dataSource;
     }

Modified: trunk/testsuite/src/resources/web/WEB-INF/jsftest-web.xml
===================================================================
--- trunk/testsuite/src/resources/web/WEB-INF/jsftest-web.xml	2008-08-25 14:02:09 UTC (rev 77430)
+++ trunk/testsuite/src/resources/web/WEB-INF/jsftest-web.xml	2008-08-25 14:03:12 UTC (rev 77431)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+<web-app 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/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-	 version="2.4">
+	 xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd"
+	 version="2.5">
     <!-- The JavaServer Faces Servlet -->
    <servlet>
       <servlet-name>javax.faces.FacesServlet</servlet-name>