[jboss-cvs] JBossAS SVN: r72211 - in projects/ejb3/trunk/core: src/main/java/org/jboss/ejb3 and 1 other directory.

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

Author: dimitris at jboss.org
Date: 2008-04-15 07:01:23 -0400 (Tue, 15 Apr 2008)
New Revision: 72211

Modified:
   projects/ejb3/trunk/core/pom.xml
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java
Log:
remove the iiop dependency and create a reminder EJBTHREE-1280 issue for removing the hardcoded JBossOrbName

Modified: projects/ejb3/trunk/core/pom.xml
===================================================================
--- projects/ejb3/trunk/core/pom.xml	2008-04-15 10:42:51 UTC (rev 72210)
+++ projects/ejb3/trunk/core/pom.xml	2008-04-15 11:01:23 UTC (rev 72211)
@@ -276,14 +276,8 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    <!--
     <dependency>
       <groupId>org.hibernate</groupId>
-      <artifactId>ejb3-persistence</artifactId>
-    </dependency>
-    -->
-    <dependency>
-      <groupId>org.hibernate</groupId>
       <artifactId>hibernate</artifactId>
       <version>3.2.6.ga</version>
     </dependency>
@@ -407,11 +401,6 @@
       <version>${version.org.jboss.jboss-as}</version>
     </dependency>
     <dependency>
-      <groupId>org.jboss.jbossas</groupId>
-      <artifactId>jboss-as-iiop</artifactId>
-      <version>${version.org.jboss.jboss-as}</version>
-    </dependency>
-    <dependency>
        <groupId>org.jboss.jbossas</groupId>
        <artifactId>jboss-as-server</artifactId>
        <version>5.0.0-SNAPSHOT</version> <!-- Only used here -->

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java	2008-04-15 10:42:51 UTC (rev 72210)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java	2008-04-15 11:01:23 UTC (rev 72211)
@@ -83,7 +83,6 @@
 import org.jboss.ejb3.security.SecurityDomainManager;
 import org.jboss.ejb3.statistics.InvocationStatistics;
 import org.jboss.ejb3.tx.UserTransactionImpl;
-import org.jboss.iiop.CorbaORBService;
 import org.jboss.injection.DependsHandler;
 import org.jboss.injection.EJBHandler;
 import org.jboss.injection.EncInjector;
@@ -272,7 +271,7 @@
    {
       try
       {
-         Util.rebind(getEnc(), "ORB", new LinkRef("java:/" + CorbaORBService.ORB_NAME));
+         Util.rebind(getEnc(), "ORB", new LinkRef("java:/JBossCorbaORB"));
       }
       catch(NamingException e)
       {