[jboss-cvs] JBossAS SVN: r109193 - in branches/switchboard-integration/testsuite: src/main/org/jboss/test/jsf/managed and 1 other directories.

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

Author: jaikiran
Date: 2010-11-08 09:51:00 -0500 (Mon, 08 Nov 2010)
New Revision: 109193

Added:
   branches/switchboard-integration/testsuite/src/resources/web/jsfinjection/WEB-INF/jboss-service.xml
Modified:
   branches/switchboard-integration/testsuite/imports/sections/jsf.xml
   branches/switchboard-integration/testsuite/src/main/org/jboss/test/jsf/managed/ENCAnnotationsManagedBean.java
   branches/switchboard-integration/testsuite/src/main/org/jboss/test/jsf/managed/SimpleManagedBean.java
Log:
JBAS-8548 Fix JSFInjection testcase

Modified: branches/switchboard-integration/testsuite/imports/sections/jsf.xml
===================================================================
--- branches/switchboard-integration/testsuite/imports/sections/jsf.xml	2010-11-08 12:46:06 UTC (rev 109192)
+++ branches/switchboard-integration/testsuite/imports/sections/jsf.xml	2010-11-08 14:51:00 UTC (rev 109193)
@@ -61,6 +61,7 @@
 
       <webinf dir="${build.resources}/web/jsfinjection/WEB-INF">
         <include name="faces-config.xml"/>
+		<include name="jboss-service.xml"/>          
       </webinf>
     </war>
     

Modified: branches/switchboard-integration/testsuite/src/main/org/jboss/test/jsf/managed/ENCAnnotationsManagedBean.java
===================================================================
--- branches/switchboard-integration/testsuite/src/main/org/jboss/test/jsf/managed/ENCAnnotationsManagedBean.java	2010-11-08 12:46:06 UTC (rev 109192)
+++ branches/switchboard-integration/testsuite/src/main/org/jboss/test/jsf/managed/ENCAnnotationsManagedBean.java	2010-11-08 14:51:00 UTC (rev 109193)
@@ -69,7 +69,7 @@
          mappedName="jbosstest/ejbs/local/ENCBean1")
    StatelessSessionLocalHome localHome;
 
-   @Resource(name="url/JBossHome", mappedName="http://www.jboss.org")
+   @Resource(name="url/JBossHome", mappedName="java:SomeWebSite")
    java.net.URL url;
 
    @Resource(name="Ints/i0", mappedName="0")

Modified: branches/switchboard-integration/testsuite/src/main/org/jboss/test/jsf/managed/SimpleManagedBean.java
===================================================================
--- branches/switchboard-integration/testsuite/src/main/org/jboss/test/jsf/managed/SimpleManagedBean.java	2010-11-08 12:46:06 UTC (rev 109192)
+++ branches/switchboard-integration/testsuite/src/main/org/jboss/test/jsf/managed/SimpleManagedBean.java	2010-11-08 14:51:00 UTC (rev 109193)
@@ -47,7 +47,7 @@
    @EJB
    SimpleLocal simpleLocal;
    
-   @Resource(name = "url/Injection", mappedName = "http://jboss.org")
+   @Resource(name = "url/Injection", mappedName = "java:SomeWebSite")
    private java.net.URL url;
    
    /**

Added: branches/switchboard-integration/testsuite/src/resources/web/jsfinjection/WEB-INF/jboss-service.xml
===================================================================
--- branches/switchboard-integration/testsuite/src/resources/web/jsfinjection/WEB-INF/jboss-service.xml	                        (rev 0)
+++ branches/switchboard-integration/testsuite/src/resources/web/jsfinjection/WEB-INF/jboss-service.xml	2010-11-08 14:51:00 UTC (rev 109193)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mbean code="org.jboss.naming.JNDIBindingServiceMgr" name="jboss.apps:name=myapp">
+    <attribute name="BindingsConfig" serialDataType="jbxb">
+        <jndi:bindings xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:jndi="urn:jboss:jndi-binding-service:1.0"
+            xs:schemaLocation="urn:jboss:jndi-binding-service resource:jndi-binding-service_1_0.xsd">
+            <!--  bind to java:SomeWebSite jndi name which is referenced in jboss-web.xml
+            via a resource-ref entry -->
+            <jndi:binding name="java:SomeWebSite">
+                <jndi:value type="java.net.URL">http://www.jboss.org</jndi:value>
+            </jndi:binding>
+
+        </jndi:bindings>
+    </attribute>
+</mbean>