[jboss-cvs] JBossAS SVN: r79012 - in projects/ejb3/trunk/embedded/src: main/resources/META-INF/services and 2 other directories.

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

Author: wolfc
Date: 2008-10-02 04:53:48 -0400 (Thu, 02 Oct 2008)
New Revision: 79012

Added:
   projects/ejb3/trunk/embedded/src/main/resources/META-INF/services/javax.ejb.spi.EJBContainerProvider
Removed:
   projects/ejb3/trunk/embedded/src/main/resources/META-INF/services/org.jboss.ejb3.api.spi.EJBContainerProvider
Modified:
   projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/JBossEJBContainerProvider.java
   projects/ejb3/trunk/embedded/src/test/java/org/jboss/ejb3/embedded/test/stateful/unit/StatefulGreeterTestCase.java
   projects/ejb3/trunk/embedded/src/test/java/org/jboss/ejb3/embedded/test/stateless/unit/GreeterTestCase.java
Log:
EJBTHREE-1492: update to EJB 3.1 PD

Modified: projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/JBossEJBContainerProvider.java
===================================================================
--- projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/JBossEJBContainerProvider.java	2008-10-02 08:52:55 UTC (rev 79011)
+++ projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/JBossEJBContainerProvider.java	2008-10-02 08:53:48 UTC (rev 79012)
@@ -21,12 +21,13 @@
  */
 package org.jboss.ejb3.embedded;
 
+import java.util.Collection;
 import java.util.Map;
 
 import javax.ejb.EJBContainer;
 import javax.ejb.EJBException;
+import javax.ejb.spi.EJBContainerProvider;
 
-import org.jboss.ejb3.api.spi.EJBContainerProvider;
 
 /**
  * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
@@ -34,10 +35,24 @@
  */
 public class JBossEJBContainerProvider implements EJBContainerProvider
 {
-   public EJBContainer createEJBContainer(Map<?, ?> properties, String... modules) throws EJBException
+   public EJBContainer createEJBContainer(Map<?, ?> properties) throws EJBException
    {
       try
       {
+         String modules[] = null;
+         if(properties != null)
+         {
+            Object o = properties.get(EJBContainer.EMBEDDABLE_MODULES_PROPERTY);
+            if(o != null)
+            {
+               if(o instanceof String)
+                  modules = new String[] { (String) o };
+               else if(o instanceof Collection)
+                  modules = toStringArray(o);
+               else
+                  throw new EJBException("Illegal type of " + EJBContainer.EMBEDDABLE_MODULES_PROPERTY + " (" + o.getClass().getName() + ") (EJB 3.1 22.2.2.2)");
+            }
+         }
          return new JBossEJBContainer(properties, modules);
       }
       catch(Throwable t)
@@ -51,4 +66,10 @@
          throw new RuntimeException(t);
       }
    }
+   
+   @SuppressWarnings("unchecked")
+   private static final String[] toStringArray(Object o)
+   {
+      return ((Collection<String>) o).toArray(new String[0]);
+   }
 }

Copied: projects/ejb3/trunk/embedded/src/main/resources/META-INF/services/javax.ejb.spi.EJBContainerProvider (from rev 79007, projects/ejb3/trunk/embedded/src/main/resources/META-INF/services/org.jboss.ejb3.api.spi.EJBContainerProvider)
===================================================================
--- projects/ejb3/trunk/embedded/src/main/resources/META-INF/services/javax.ejb.spi.EJBContainerProvider	                        (rev 0)
+++ projects/ejb3/trunk/embedded/src/main/resources/META-INF/services/javax.ejb.spi.EJBContainerProvider	2008-10-02 08:53:48 UTC (rev 79012)
@@ -0,0 +1 @@
+org.jboss.ejb3.embedded.JBossEJBContainerProvider
\ No newline at end of file

Deleted: projects/ejb3/trunk/embedded/src/main/resources/META-INF/services/org.jboss.ejb3.api.spi.EJBContainerProvider
===================================================================
--- projects/ejb3/trunk/embedded/src/main/resources/META-INF/services/org.jboss.ejb3.api.spi.EJBContainerProvider	2008-10-02 08:52:55 UTC (rev 79011)
+++ projects/ejb3/trunk/embedded/src/main/resources/META-INF/services/org.jboss.ejb3.api.spi.EJBContainerProvider	2008-10-02 08:53:48 UTC (rev 79012)
@@ -1 +0,0 @@
-org.jboss.ejb3.embedded.JBossEJBContainerProvider
\ No newline at end of file

Modified: projects/ejb3/trunk/embedded/src/test/java/org/jboss/ejb3/embedded/test/stateful/unit/StatefulGreeterTestCase.java
===================================================================
--- projects/ejb3/trunk/embedded/src/test/java/org/jboss/ejb3/embedded/test/stateful/unit/StatefulGreeterTestCase.java	2008-10-02 08:52:55 UTC (rev 79011)
+++ projects/ejb3/trunk/embedded/src/test/java/org/jboss/ejb3/embedded/test/stateful/unit/StatefulGreeterTestCase.java	2008-10-02 08:53:48 UTC (rev 79012)
@@ -55,7 +55,8 @@
    {
       Properties properties = new Properties();
       String module = getURLToTestClasses();
-      EJBContainer.createEJBContainer(properties, module);
+      properties.setProperty(EJBContainer.EMBEDDABLE_MODULES_PROPERTY, module);
+      EJBContainer.createEJBContainer(properties);
    }
    
    private static String getURLToTestClasses()

Modified: projects/ejb3/trunk/embedded/src/test/java/org/jboss/ejb3/embedded/test/stateless/unit/GreeterTestCase.java
===================================================================
--- projects/ejb3/trunk/embedded/src/test/java/org/jboss/ejb3/embedded/test/stateless/unit/GreeterTestCase.java	2008-10-02 08:52:55 UTC (rev 79011)
+++ projects/ejb3/trunk/embedded/src/test/java/org/jboss/ejb3/embedded/test/stateless/unit/GreeterTestCase.java	2008-10-02 08:53:48 UTC (rev 79012)
@@ -56,7 +56,8 @@
    {
       Properties properties = new Properties();
       String module = getURLToTestClasses();
-      EJBContainer.createEJBContainer(properties, module);
+      properties.setProperty(EJBContainer.EMBEDDABLE_MODULES_PROPERTY, module);
+      EJBContainer.createEJBContainer(properties);
    }
    
    private static String getURLToTestClasses()