[jboss-cvs] JBossAS SVN: r82756 - in projects/ejb3/trunk: build and 4 other directories.

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

Author: ALRubinger
Date: 2009-01-11 05:40:27 -0500 (Sun, 11 Jan 2009)
New Revision: 82756

Modified:
   projects/ejb3/trunk/as-int/pom.xml
   projects/ejb3/trunk/build/pom.xml
   projects/ejb3/trunk/common/pom.xml
   projects/ejb3/trunk/common/src/main/java/org/jboss/ejb3/common/metadata/MetadataUtil.java
   projects/ejb3/trunk/core/pom.xml
   projects/ejb3/trunk/plugin/pom.xml
Log:
[EJBTHREE-1676] Wrap JBossServiceBeanMetaData in JBossServicePolicyDecorator so @Service operations are passed along to the delegate

Modified: projects/ejb3/trunk/as-int/pom.xml
===================================================================
--- projects/ejb3/trunk/as-int/pom.xml	2009-01-11 10:01:23 UTC (rev 82755)
+++ projects/ejb3/trunk/as-int/pom.xml	2009-01-11 10:40:27 UTC (rev 82756)
@@ -29,7 +29,7 @@
     
      -->
     <version.org.jboss.ejb3_core>1.0.0-SNAPSHOT</version.org.jboss.ejb3_core>
-    <version.org.jboss.ejb3_deployers>0.1.2</version.org.jboss.ejb3_deployers>
+    <version.org.jboss.ejb3_deployers>0.1.3-SNAPSHOT</version.org.jboss.ejb3_deployers>
     <version.org.jboss.ejb3_mc.int>0.1.0</version.org.jboss.ejb3_mc.int>
   
   </properties>

Modified: projects/ejb3/trunk/build/pom.xml
===================================================================
--- projects/ejb3/trunk/build/pom.xml	2009-01-11 10:01:23 UTC (rev 82755)
+++ projects/ejb3/trunk/build/pom.xml	2009-01-11 10:40:27 UTC (rev 82756)
@@ -334,7 +334,7 @@
       <dependency>
         <groupId>org.jboss.metadata</groupId>
         <artifactId>jboss-metadata</artifactId>
-        <version>1.0.0.CR8</version>
+        <version>1.0.0-SNAPSHOT</version>
       </dependency>
  
       <dependency>

Modified: projects/ejb3/trunk/common/pom.xml
===================================================================
--- projects/ejb3/trunk/common/pom.xml	2009-01-11 10:01:23 UTC (rev 82755)
+++ projects/ejb3/trunk/common/pom.xml	2009-01-11 10:40:27 UTC (rev 82756)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>jboss-ejb3-build</artifactId>
     <groupId>org.jboss.ejb3</groupId>
-    <version>1.0.0-Beta10</version>
+    <version>1.0.0-SNAPSHOT</version>
     <relativePath>../build/pom.xml</relativePath>
   </parent>
 

Modified: projects/ejb3/trunk/common/src/main/java/org/jboss/ejb3/common/metadata/MetadataUtil.java
===================================================================
--- projects/ejb3/trunk/common/src/main/java/org/jboss/ejb3/common/metadata/MetadataUtil.java	2009-01-11 10:01:23 UTC (rev 82755)
+++ projects/ejb3/trunk/common/src/main/java/org/jboss/ejb3/common/metadata/MetadataUtil.java	2009-01-11 10:40:27 UTC (rev 82756)
@@ -31,8 +31,10 @@
 import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeansMetaData;
 import org.jboss.metadata.ejb.jboss.JBossEntityBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.metadata.ejb.jboss.JBossServiceBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
 import org.jboss.metadata.ejb.jboss.jndipolicy.plugins.BasicJndiBindingPolicy;
+import org.jboss.metadata.ejb.jboss.jndipolicy.plugins.JBossServicePolicyDecorator;
 import org.jboss.metadata.ejb.jboss.jndipolicy.plugins.JBossSessionPolicyDecorator;
 import org.jboss.metadata.ejb.jboss.jndipolicy.plugins.JbossEntityPolicyDecorator;
 import org.jboss.metadata.ejb.jboss.jndipolicy.spi.DefaultJndiBindingPolicy;
@@ -182,8 +184,8 @@
          // Obtain a Policy
          DefaultJndiBindingPolicy policy = getJndiBindingPolicy(bean, mdJndiPolicyName, cl);
 
-         // If this is a Session or Service Bean
-         if (bean.isSession() || bean.isService())
+         // If this is a Session Spec Bean (SLSB or SFSB)
+         if (bean.isSession() && !bean.isService())
          {
             // Cast
             assert bean instanceof JBossSessionBeanMetaData : JBossEnterpriseBeanMetaData.class.getSimpleName()
@@ -191,9 +193,21 @@
             JBossSessionBeanMetaData sessionBean = (JBossSessionBeanMetaData) bean;
 
             // Create a Session JNDI Policy Decorated Bean
-            decoratedBean = new JBossSessionPolicyDecorator(sessionBean, policy);
+            decoratedBean = new JBossSessionPolicyDecorator<JBossSessionBeanMetaData>(sessionBean, policy);
          }
 
+         // If this is a @Service Bean
+         if (bean.isService())
+         {
+            // Cast
+            assert bean instanceof JBossServiceBeanMetaData : JBossEnterpriseBeanMetaData.class.getSimpleName()
+                  + " representing as @Service Bean is not castable to " + JBossServiceBeanMetaData.class.getName();
+            JBossServiceBeanMetaData serviceBean = (JBossServiceBeanMetaData) bean;
+
+            // Create a @Service JNDI Policy Decorated Bean
+            decoratedBean = new JBossServicePolicyDecorator(serviceBean, policy);
+         }
+
          // If this is an Entity Bean
          if (bean.isEntity())
          {

Modified: projects/ejb3/trunk/core/pom.xml
===================================================================
--- projects/ejb3/trunk/core/pom.xml	2009-01-11 10:01:23 UTC (rev 82755)
+++ projects/ejb3/trunk/core/pom.xml	2009-01-11 10:40:27 UTC (rev 82756)
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.jboss.ejb3</groupId>
     <artifactId>jboss-ejb3-build</artifactId>
-    <version>1.0.0-Beta10</version>
+    <version>1.0.0-SNAPSHOT</version>
     <relativePath>../build/pom.xml</relativePath>
   </parent>
 

Modified: projects/ejb3/trunk/plugin/pom.xml
===================================================================
--- projects/ejb3/trunk/plugin/pom.xml	2009-01-11 10:01:23 UTC (rev 82755)
+++ projects/ejb3/trunk/plugin/pom.xml	2009-01-11 10:40:27 UTC (rev 82756)
@@ -120,6 +120,13 @@
       <version>1.0.0-SNAPSHOT</version>
       <optional>true</optional>
     </dependency>
+
+    <dependency>
+      <groupId>org.jboss.metadata</groupId>
+      <artifactId>jboss-metadata</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+      <optional>true</optional>
+    </dependency>
     
   </dependencies>
 </project>
\ No newline at end of file