[jboss-cvs] JBossAS SVN: r75724 - in projects/metadata/trunk/src: main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins and 3 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Sat Jul 12 01:26:55 EDT 2008


Author: ALRubinger
Date: 2008-07-12 01:26:54 -0400 (Sat, 12 Jul 2008)
New Revision: 75724

Removed:
   projects/metadata/trunk/src/test/java/org/jboss/metadata/test/ejb3/legacy0_1_7/
Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/BasicJndiBindingPolicy.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/JBossSessionPolicyDecorator.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/spi/EjbDeploymentSummary.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/ResolveJndiNameDecoratorUnitTestCase.java
Log:
[JBMETA-68] Cleanup and resolution

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java	2008-07-11 22:30:05 UTC (rev 75723)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java	2008-07-12 05:26:54 UTC (rev 75724)
@@ -652,12 +652,6 @@
          // Initialize a CL
          ClassLoader loader = null;
          
-         // Attempt to obtain CL from deployment summary
-         if (dsummary != null)
-         {
-            dsummary.getLoader();
-         }
-         
          // Fall back on TCL if there's no DeploymentSummary
          if (loader == null)
          {

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/BasicJndiBindingPolicy.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/BasicJndiBindingPolicy.java	2008-07-11 22:30:05 UTC (rev 75723)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/BasicJndiBindingPolicy.java	2008-07-12 05:26:54 UTC (rev 75724)
@@ -150,7 +150,7 @@
    private String getBaseJndiName(EjbDeploymentSummary summary)
    {
       String baseName = summary.getBeanMD().getMappedName();
-      
+
       //TODO Ugly, should be using polymorphism not runtime type checks w/ casting
       if (summary.getBeanMD().isSession())
       {
@@ -166,7 +166,7 @@
             baseName = ((JBossEntityBeanMetaData) summary.getBeanMD()).getJndiName();
          }
       }
-      
+
       if (baseName == null || baseName.trim().length() == 0)
       {
          baseName = summary.getBeanMD().getEjbName();

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/JBossSessionPolicyDecorator.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/JBossSessionPolicyDecorator.java	2008-07-11 22:30:05 UTC (rev 75723)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/JBossSessionPolicyDecorator.java	2008-07-12 05:26:54 UTC (rev 75724)
@@ -124,6 +124,13 @@
       assert jndiPolicy != null : this.getClass().getSimpleName() + " requires a specified "
             + DefaultJndiBindingPolicy.class.getSimpleName();
       
+      // Disallow double-wrapping
+      if(delegate instanceof JBossSessionPolicyDecorator)
+      {
+         JBossSessionPolicyDecorator d =(JBossSessionPolicyDecorator)delegate;
+         delegate = d.delegate;
+      }
+      
       this.delegate = delegate;
       this.jndiPolicy = jndiPolicy;
    }

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/spi/EjbDeploymentSummary.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/spi/EjbDeploymentSummary.java	2008-07-11 22:30:05 UTC (rev 75723)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/spi/EjbDeploymentSummary.java	2008-07-12 05:26:54 UTC (rev 75724)
@@ -21,6 +21,7 @@
  */
 package org.jboss.metadata.ejb.jboss.jndipolicy.spi;
 
+import org.jboss.logging.Logger;
 import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
 
@@ -37,116 +38,152 @@
    /** The serialVersionUID. */
    private static final long serialVersionUID = 2559283688891890756L;
 
-   // Instance Members
-   private String ejbName;
+   private static final Logger log = Logger.getLogger(EjbDeploymentSummary.class);
 
-   private String beanClassName;
+   @Deprecated
+   private static final String DEPRECATION_MESSAGE_ACCESSOR = "Deprecated, use "
+         + EjbDeploymentSummary.class.getSimpleName() + " metadata to access state";
 
-   private boolean isLocal;
+   @Deprecated
+   private static final String DEPRECATION_MESSAGE_MUTATOR = DEPRECATION_MESSAGE_ACCESSOR
+         + "; mutation here will have no effect";
+   
+   @Deprecated
+   private static final String DEPRECATION_MESSAGE_CONSTRUCTOR = "Use EjbDeploymentSummary(JBossEnterpriseBeanMetaData beanMD, DeploymentSummary dsummary)";
 
-   private boolean isStateful;
-
-   private boolean isHome;
-
-   private boolean isService;
+   // Instance Members
    private JBossEnterpriseBeanMetaData beanMD;
 
+   @Deprecated
    public EjbDeploymentSummary()
    {
-      
+      log.warn(EjbDeploymentSummary.DEPRECATION_MESSAGE_CONSTRUCTOR);
    }
+
    public EjbDeploymentSummary(JBossEnterpriseBeanMetaData beanMD, DeploymentSummary dsummary)
    {
       super(dsummary);
-      // 
-      this.setBeanClassName(beanMD.getEjbClass());
-      this.setEjbName(beanMD.getEjbName());
-      this.setService(beanMD.isService());
       
-      if(beanMD instanceof JBossSessionBeanMetaData)
-      {
-         JBossSessionBeanMetaData sbeanMD = (JBossSessionBeanMetaData) beanMD;
-         this.setStateful(sbeanMD.isStateful());
-         if(sbeanMD.getHome() != null && sbeanMD.getHome().length() > 0)
-            this.setHome(true);
-         if(sbeanMD.getLocal() != null && sbeanMD.getLocal().length() > 0)
-            this.setLocal(true);
-         // Is a local-home also a home?
-      }
+      assert beanMD != null : JBossEnterpriseBeanMetaData.class.getSimpleName() + " instance is a required argument";
+
       this.beanMD = beanMD;
    }
 
    // Accessors / Mutators
 
+   public JBossEnterpriseBeanMetaData getBeanMD()
+   {
+      return beanMD;
+   }
+
+   public void setBeanMD(JBossEnterpriseBeanMetaData beanMD)
+   {
+      this.beanMD = beanMD;
+   }
+
+   /*
+    * 
+    * Deprecated below this marker
+    * 
+    */
+
+   @Deprecated
    public String getEjbName()
    {
-      return ejbName;
+      log.warn(EjbDeploymentSummary.DEPRECATION_MESSAGE_ACCESSOR);
+      return this.getBeanMD().getEjbName();
    }
 
+   @Deprecated
    public void setEjbName(String ejbName)
    {
-      this.ejbName = ejbName;
+      log.warn(EjbDeploymentSummary.DEPRECATION_MESSAGE_MUTATOR);
    }
 
+   @Deprecated
    public boolean isLocal()
    {
-      return isLocal;
+      log.warn(EjbDeploymentSummary.DEPRECATION_MESSAGE_ACCESSOR);
+
+      JBossEnterpriseBeanMetaData md = this.getBeanMD();
+      if (md.isSession())
+      {
+         JBossSessionBeanMetaData smd = (JBossSessionBeanMetaData) md;
+         return smd.getLocal() != null && smd.getLocal().trim().length() > 0;
+      }
+      return false;
    }
 
+   @Deprecated
    public void setLocal(boolean isLocal)
    {
-      this.isLocal = isLocal;
+      log.warn(EjbDeploymentSummary.DEPRECATION_MESSAGE_MUTATOR);
    }
 
+   @Deprecated
    public boolean isStateful()
    {
-      return isStateful;
+      log.warn(EjbDeploymentSummary.DEPRECATION_MESSAGE_ACCESSOR);
+
+      JBossEnterpriseBeanMetaData md = this.getBeanMD();
+      if (md.isService())
+      {
+         JBossSessionBeanMetaData smd = (JBossSessionBeanMetaData) md;
+         return smd.isStateful();
+      }
+      return false;
    }
 
+   @Deprecated
    public void setStateful(boolean isStateful)
    {
-      this.isStateful = isStateful;
+      log.warn(EjbDeploymentSummary.DEPRECATION_MESSAGE_MUTATOR);
    }
 
+   @Deprecated
    public boolean isHome()
    {
-      return isHome;
+      log.warn(EjbDeploymentSummary.DEPRECATION_MESSAGE_ACCESSOR);
+
+      JBossEnterpriseBeanMetaData md = this.getBeanMD();
+      if (md.isSession())
+      {
+         JBossSessionBeanMetaData smd = (JBossSessionBeanMetaData) md;
+         return smd.getHome() != null && smd.getHome().trim().length() > 0;
+      }
+      return false;
    }
 
+   @Deprecated
    public void setHome(boolean isHome)
    {
-      this.isHome = isHome;
+      log.warn(EjbDeploymentSummary.DEPRECATION_MESSAGE_MUTATOR);
    }
 
+   @Deprecated
    public boolean isService()
    {
-      return isService;
+      log.warn(EjbDeploymentSummary.DEPRECATION_MESSAGE_ACCESSOR);
+      return this.getBeanMD().isService();
    }
 
+   @Deprecated
    public void setService(boolean isService)
    {
-      this.isService = isService;
+      log.warn(EjbDeploymentSummary.DEPRECATION_MESSAGE_MUTATOR);
    }
 
-
+   @Deprecated
    public String getBeanClassName()
    {
-      return beanClassName;
+      log.warn(EjbDeploymentSummary.DEPRECATION_MESSAGE_ACCESSOR);
+      return this.getBeanMD().getEjbClass();
    }
 
+   @Deprecated
    public void setBeanClassName(String beanClassName)
    {
-      this.beanClassName = beanClassName;
+      log.warn(EjbDeploymentSummary.DEPRECATION_MESSAGE_MUTATOR);
    }
 
-   
-   public JBossEnterpriseBeanMetaData getBeanMD()
-   {
-      return beanMD;
-   }
-   public void setBeanMD(JBossEnterpriseBeanMetaData beanMD)
-   {
-      this.beanMD = beanMD;
-   }
-
 }

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/ResolveJndiNameDecoratorUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/ResolveJndiNameDecoratorUnitTestCase.java	2008-07-11 22:30:05 UTC (rev 75723)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/ResolveJndiNameDecoratorUnitTestCase.java	2008-07-12 05:26:54 UTC (rev 75724)
@@ -23,7 +23,6 @@
 
 import junit.framework.TestCase;
 
-import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeansMetaData;
 import org.jboss.metadata.ejb.jboss.JBossEntityBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
@@ -38,7 +37,6 @@
 import org.jboss.metadata.ejb.jboss.jndipolicy.spi.KnownInterfaces;
 import org.jboss.metadata.ejb.spec.BusinessLocalsMetaData;
 import org.jboss.metadata.ejb.spec.BusinessRemotesMetaData;
-import org.jboss.util.xml.JBossEntityResolver;
 
 /**
  * Tests that the JNDI Policy Decorators for Object Model 
@@ -52,6 +50,7 @@
 public class ResolveJndiNameDecoratorUnitTestCase extends TestCase
 {
 
+   @SuppressWarnings(value="deprecation")
    public void testResolvedJndiName()
    {
       // Obtain MD and define expected values for resolution
@@ -69,6 +68,7 @@
       assertEquals(expected, resolvedDeprecated);
    }
 
+   @SuppressWarnings(value="deprecation")
    public void testResolvedJndiNameWithMappedName()
    {
       // Obtain MD, set mappedName, and define expected values for resolution
@@ -87,6 +87,7 @@
       assertEquals(expected, resolvedDeprecated);
    }
 
+   @SuppressWarnings(value="deprecation")
    public void testResolvedJndiNames()
    {
       // Get Metadata
@@ -124,6 +125,7 @@
    /**
     * JBMETA-36, JBMETA-37
     */
+   @SuppressWarnings(value="deprecation")
    public void testResolvedJndiNamesWithKnownIfaces()
    {
       // Obtain MD
@@ -213,6 +215,7 @@
       assertEquals(expectedLocalHome, resolvedJndiNameLocalHomeD);
    }
 
+   @SuppressWarnings(value="deprecation")
    public void testResolvedJndiNamesWithKnownIfaces2x()
    {
       // Get MD
@@ -254,16 +257,17 @@
       // Test Deprecated, backwards-compat behavior (may be removed when these methods no longer exist, JBMETA-68)
       String resolvedJndiNameD = sbeanMD.determineJndiName();
       assertEquals(expectedRemote, resolvedJndiNameD);
-      String resolvedJndiNameHomeD = sbeanMD.determineResolvedJndiName("org.jboss.ifaces.HomeIF", null);
+      String resolvedJndiNameHomeD = sbeanMD.determineResolvedJndiName(home, null);
       assertEquals(expectedHome, resolvedJndiNameHomeD);
       assertEquals(expectedLocalHome, sbeanMD.determineLocalJndiName());
-      String resolvedJndiNameLocalHomeD = sbeanMD.determineResolvedJndiName("org.jboss.ifaces.LocalHomeIF", null);
+      String resolvedJndiNameLocalHomeD = sbeanMD.determineResolvedJndiName(localHome, null);
       assertEquals(sbeanMD.determineLocalJndiName(), resolvedJndiNameLocalHomeD);
    }
 
    /**
     * Test resolved jndi name for an entity bean 
     */
+   @SuppressWarnings(value="deprecation")
    public void testResolvedJndiNamesWithKnownIfacesEntity()
    {
       // Obtain MD
@@ -320,6 +324,7 @@
     * JBossSessionPolicyDecorator
     * 
     */
+   @SuppressWarnings(value="deprecation")
    public void testResolvedJndiNamesWithMDPolicy()
    {
       // Get Metadata




More information about the jboss-cvs-commits mailing list