[jboss-cvs] JBossAS SVN: r86025 - in branches/Branch_5_x/testsuite: src/main/org/jboss/test/hibernate/ejb/interfaces and 1 other directories.

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

Author: scott.stark at jboss.org
Date: 2009-03-18 00:03:22 -0400 (Wed, 18 Mar 2009)
New Revision: 86025

Modified:
   branches/Branch_5_x/testsuite/.classpath
   branches/Branch_5_x/testsuite/build.xml
   branches/Branch_5_x/testsuite/src/main/org/jboss/test/hibernate/ejb/interfaces/ProfileServiceHome.java
   branches/Branch_5_x/testsuite/src/main/org/jboss/test/hibernate/ejb/interfaces/ProfileServiceUtil.java
   branches/Branch_5_x/testsuite/src/resources/hibernate/ejb/META-INF/jboss.xml
Log:
JBAS-6598, bind ejb under hibernate/ProfileService to avoid conflicts with profleservice bindings.

Modified: branches/Branch_5_x/testsuite/.classpath
===================================================================
--- branches/Branch_5_x/testsuite/.classpath	2009-03-18 03:39:50 UTC (rev 86024)
+++ branches/Branch_5_x/testsuite/.classpath	2009-03-18 04:03:22 UTC (rev 86025)
@@ -53,5 +53,7 @@
 	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-kernel-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-dependency-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap/lib/jboss-bootstrap.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/org/slf4j/lib/slf4j-api.jar" sourcepath="/thirdparty/org/slf4j/lib/slf4j-api-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/org/jboss/slf4j/lib/slf4j-jboss-logging.jar" sourcepath="/thirdparty/org/jboss/slf4j/lib/slf4j-jboss-logging-sources.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: branches/Branch_5_x/testsuite/build.xml
===================================================================
--- branches/Branch_5_x/testsuite/build.xml	2009-03-18 03:39:50 UTC (rev 86024)
+++ branches/Branch_5_x/testsuite/build.xml	2009-03-18 04:03:22 UTC (rev 86025)
@@ -186,6 +186,9 @@
 			
       <!-- org.jboss.aspects:jboss-aspects -->
       <path refid="org.jboss.aspects.classpath"/>
+      <!-- hibernate tests need slfj4 -->
+      <path refid="org.jboss.slf4j.classpath"/>
+      <path refid="org.slf4j.classpath"/>
 
    </path>
 

Modified: branches/Branch_5_x/testsuite/src/main/org/jboss/test/hibernate/ejb/interfaces/ProfileServiceHome.java
===================================================================
--- branches/Branch_5_x/testsuite/src/main/org/jboss/test/hibernate/ejb/interfaces/ProfileServiceHome.java	2009-03-18 03:39:50 UTC (rev 86024)
+++ branches/Branch_5_x/testsuite/src/main/org/jboss/test/hibernate/ejb/interfaces/ProfileServiceHome.java	2009-03-18 04:03:22 UTC (rev 86025)
@@ -28,7 +28,7 @@
    extends javax.ejb.EJBHome
 {
    public static final String COMP_NAME="java:comp/env/ejb/ProfileService";
-   public static final String JNDI_NAME="ProfileService";
+   public static final String JNDI_NAME="hibernate/ProfileService";
 
    public org.jboss.test.hibernate.ejb.interfaces.ProfileService create()
       throws javax.ejb.CreateException,java.rmi.RemoteException;

Modified: branches/Branch_5_x/testsuite/src/main/org/jboss/test/hibernate/ejb/interfaces/ProfileServiceUtil.java
===================================================================
--- branches/Branch_5_x/testsuite/src/main/org/jboss/test/hibernate/ejb/interfaces/ProfileServiceUtil.java	2009-03-18 03:39:50 UTC (rev 86024)
+++ branches/Branch_5_x/testsuite/src/main/org/jboss/test/hibernate/ejb/interfaces/ProfileServiceUtil.java	2009-03-18 04:03:22 UTC (rev 86025)
@@ -50,7 +50,8 @@
     */
    public static org.jboss.test.hibernate.ejb.interfaces.ProfileServiceHome getHome() throws javax.naming.NamingException
    {
-         return (org.jboss.test.hibernate.ejb.interfaces.ProfileServiceHome) lookupHome(null, org.jboss.test.hibernate.ejb.interfaces.ProfileServiceHome.JNDI_NAME, org.jboss.test.hibernate.ejb.interfaces.ProfileServiceHome.class);
+      Object home = lookupHome(null, org.jboss.test.hibernate.ejb.interfaces.ProfileServiceHome.JNDI_NAME, org.jboss.test.hibernate.ejb.interfaces.ProfileServiceHome.class);
+      return (org.jboss.test.hibernate.ejb.interfaces.ProfileServiceHome) home;
    }
 
    /**

Modified: branches/Branch_5_x/testsuite/src/resources/hibernate/ejb/META-INF/jboss.xml
===================================================================
--- branches/Branch_5_x/testsuite/src/resources/hibernate/ejb/META-INF/jboss.xml	2009-03-18 03:39:50 UTC (rev 86024)
+++ branches/Branch_5_x/testsuite/src/resources/hibernate/ejb/META-INF/jboss.xml	2009-03-18 04:03:22 UTC (rev 86025)
@@ -6,7 +6,7 @@
    <enterprise-beans>
       <session>
          <ejb-name>ProfileService</ejb-name>
-         <jndi-name>ProfileService</jndi-name>
+         <jndi-name>hibernate/ProfileService</jndi-name>
       </session>
    </enterprise-beans>