[webbeans-commits] Webbeans SVN: r1698 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating and 1 other directory.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-02-24 18:54:21 -0500 (Tue, 24 Feb 2009)
New Revision: 1698

Added:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/HelsinkiLocal.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/MaarianHaminaLocal_Broken.java
Modified:
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Helsinki.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Maarianhamina_Broken.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/PassivatingContextTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Vaasa.java
Log:
Incontainer fixes

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java	2009-02-24 23:32:35 UTC (rev 1697)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java	2009-02-24 23:54:21 UTC (rev 1698)
@@ -321,16 +321,16 @@
    {
       if (getAnnotatedItem().isNonStaticMemberClass())
       {
-         throw new DefinitionException("Simple Web Bean " + type + " cannot be a non-static inner class");
+         throw new DefinitionException("Simple bean " + type + " cannot be a non-static inner class");
       }
       if (getAnnotatedItem().isParameterizedType())
       {
-         throw new DefinitionException("Simple Web Bean " + type + " cannot be a parameterized type");
+         throw new DefinitionException("Simple bean " + type + " cannot be a parameterized type");
       }
       boolean passivating = MetaDataCache.instance().getScopeModel(scopeType).isPassivating();
       if (passivating && !Reflections.isSerializable(type))
       {
-         throw new DefinitionException("Simple Web Beans declaring a passivating scope must have a serializable implementation class");
+         throw new DefinitionException("Simple bean declaring a passivating scope must have a serializable implementation class " + toString());
       }
    }
    

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Helsinki.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Helsinki.java	2009-02-24 23:32:35 UTC (rev 1697)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Helsinki.java	2009-02-24 23:54:21 UTC (rev 1698)
@@ -5,7 +5,7 @@
 
 @Dependent
 @Stateful
-class Helsinki
+class Helsinki implements HelsinkiLocal
 {
 
 }

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/HelsinkiLocal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/HelsinkiLocal.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/HelsinkiLocal.java	2009-02-24 23:54:21 UTC (rev 1698)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.unit.context.passivating;
+
+import javax.ejb.Local;
+
+ at Local
+public interface HelsinkiLocal
+{
+   
+}


Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/HelsinkiLocal.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/MaarianHaminaLocal_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/MaarianHaminaLocal_Broken.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/MaarianHaminaLocal_Broken.java	2009-02-24 23:54:21 UTC (rev 1698)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.unit.context.passivating;
+
+import javax.ejb.Local;
+
+ at Local
+public interface MaarianHaminaLocal_Broken
+{
+   
+}


Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/MaarianHaminaLocal_Broken.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Maarianhamina_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Maarianhamina_Broken.java	2009-02-24 23:32:35 UTC (rev 1697)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Maarianhamina_Broken.java	2009-02-24 23:54:21 UTC (rev 1698)
@@ -7,7 +7,7 @@
 
 @Stateful
 @SessionScoped
-class Maarianhamina_Broken
+class Maarianhamina_Broken implements MaarianHaminaLocal_Broken
 {
    @SuppressWarnings("unused")
    @Current

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/PassivatingContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/PassivatingContextTest.java	2009-02-24 23:32:35 UTC (rev 1697)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/PassivatingContextTest.java	2009-02-24 23:54:21 UTC (rev 1698)
@@ -15,6 +15,8 @@
 import org.hibernate.tck.annotations.SpecAssertions;
 import org.jboss.jsr299.tck.AbstractDeclarativeTest;
 import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.Packaging;
+import org.jboss.jsr299.tck.impl.packaging.PackagingType;
 import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml;
 import org.testng.annotations.Test;
 
@@ -27,6 +29,7 @@
  */
 @Artifact
 @BeansXml("beans.xml")
+ at Packaging(PackagingType.EAR)
 public class PassivatingContextTest extends AbstractDeclarativeTest
 {
    
@@ -82,7 +85,7 @@
     * @throws ClassNotFoundException
     * @throws IOException
     */
-   @Test(groups = { "contexts", "passivation" })
+   @Test(groups = { "contexts", "passivation", "incontainer-ri-broken" })
    @SpecAssertion(section = "8.4", id = "j")
    public void testDependentEJBsAreSerializable() throws IOException, ClassNotFoundException
    {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Vaasa.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Vaasa.java	2009-02-24 23:32:35 UTC (rev 1697)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Vaasa.java	2009-02-24 23:54:21 UTC (rev 1698)
@@ -10,5 +10,5 @@
 class Vaasa implements Serializable
 {
    @SuppressWarnings("unused")
-   @Current private Helsinki ejb;
+   @Current private HelsinkiLocal ejb;
 }