[jboss-cvs] JBossAS SVN: r75474 - in projects/ejb3/dev/proxy-int/core: src/main/java/org/jboss/ejb3/metadata and 2 other directories.

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

Author: ALRubinger
Date: 2008-07-08 01:57:22 -0400 (Tue, 08 Jul 2008)
New Revision: 75474

Modified:
   projects/ejb3/dev/proxy-int/core/pom.xml
   projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/metadata/JBossSessionGenericWrapper.java
   projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/proxy/factory/ProxyFactoryHelper.java
   projects/ejb3/dev/proxy-int/core/src/test/resources/basicbootstrap-beans.xml
Log:
[EJBTHREE-1385] Resolve Unit Test failures with latest developments in jboss-metadata trunk

Modified: projects/ejb3/dev/proxy-int/core/pom.xml
===================================================================
--- projects/ejb3/dev/proxy-int/core/pom.xml	2008-07-08 05:50:29 UTC (rev 75473)
+++ projects/ejb3/dev/proxy-int/core/pom.xml	2008-07-08 05:57:22 UTC (rev 75474)
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.jboss.ejb3</groupId>
     <artifactId>jboss-ejb3-build</artifactId>
-    <version>0.13.8</version>
+    <version>0.13.9-SNAPSHOT</version>
     <relativePath>../build/pom.xml</relativePath>
   </parent>
 
@@ -132,7 +132,7 @@
           <groupId>org.jboss.javaee</groupId>
           <artifactId>jboss-javaee</artifactId>
         </exclusion>
-      </exclusions>      
+      </exclusions>
     </dependency>
     
     <dependency>
@@ -327,7 +327,7 @@
     <dependency>
       <groupId>org.jboss.ejb3</groupId>
       <artifactId>jboss-ejb3-test</artifactId>
-      <version>0.1.1</version>
+      <version>0.1.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 

Modified: projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/metadata/JBossSessionGenericWrapper.java
===================================================================
--- projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/metadata/JBossSessionGenericWrapper.java	2008-07-08 05:50:29 UTC (rev 75473)
+++ projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/metadata/JBossSessionGenericWrapper.java	2008-07-08 05:57:22 UTC (rev 75474)
@@ -109,10 +109,6 @@
    {
       return delegate.determineInvokerBindings();
    }
-   public String determineLocalJndiName()
-   {
-      return delegate.determineLocalJndiName();
-   }
    public boolean equals(Object obj)
    {
       return delegate.equals(obj);

Modified: projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/proxy/factory/ProxyFactoryHelper.java
===================================================================
--- projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/proxy/factory/ProxyFactoryHelper.java	2008-07-08 05:50:29 UTC (rev 75473)
+++ projects/ejb3/dev/proxy-int/core/src/main/java/org/jboss/ejb3/proxy/factory/ProxyFactoryHelper.java	2008-07-08 05:57:22 UTC (rev 75474)
@@ -65,6 +65,8 @@
 import org.jboss.logging.Logger;
 import org.jboss.metadata.ejb.jboss.jndipolicy.spi.DefaultJndiBindingPolicy;
 import org.jboss.metadata.ejb.jboss.jndipolicy.spi.EjbDeploymentSummary;
+import org.jboss.metadata.ejb.jboss.jndipolicy.spi.JbossEnterpriseBeanJndiNameResolver;
+import org.jboss.metadata.ejb.jboss.jndipolicy.spi.KnownInterfaces;
 
 /**
  * Comment
@@ -892,8 +894,7 @@
       if (localBinding == null)
       {
          // Get JNDI name from policy
-         String name = ProxyFactoryHelper.getJndiBindingPolicy(container).getDefaultLocalJndiName(
-               ProxyFactoryHelper.getDeploymentSummaryFromContainer(container));
+         String name = JbossEnterpriseBeanJndiNameResolver.resolveJndiName(container.getXml(), KnownInterfaces.LOCAL);
 
          // If we should check for naming conflict
          if (conflictCheck){
@@ -1040,16 +1041,13 @@
    {
       // Construct Deployment Summary
       EjbDeploymentSummary summary = new EjbDeploymentSummary();
-      summary.setEjbName(container.getEjbName());
-      summary.setService(container instanceof ServiceContainer);
-      summary.setStateful(container instanceof StatefulContainer);
       summary.setDeploymentName(container.getDeployment().getName());
-      summary.setBeanClassName(container.getBeanClass().getName());
       DeploymentScope scope = container.getDeployment().getEar();
       if (scope != null)
       {
          summary.setDeploymentScopeBaseName(scope.getBaseName());
       }
+      summary.setBeanMD(container.getXml());
 
       // Return
       return summary;

Modified: projects/ejb3/dev/proxy-int/core/src/test/resources/basicbootstrap-beans.xml
===================================================================
--- projects/ejb3/dev/proxy-int/core/src/test/resources/basicbootstrap-beans.xml	2008-07-08 05:50:29 UTC (rev 75473)
+++ projects/ejb3/dev/proxy-int/core/src/test/resources/basicbootstrap-beans.xml	2008-07-08 05:57:22 UTC (rev 75474)
@@ -182,7 +182,7 @@
    </bean>
    
    <bean name="Connector" class="org.jboss.remoting.transport.Connector">
-      <property name="invokerLocator">socket://0.0.0.0:3874</property>
+      <property name="invokerLocator">socket://0.0.0.0:3873</property>
       <property name="serverConfiguration"><inject bean="ServerConfiguration"/></property>
    </bean>
 </deployment>
\ No newline at end of file