svn commit: r1333188 - /openejb/trunk/openejb/arquillian-tomee/arquillian-openejb-container/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java

[rmannibucau]

Author: rmannibucau
Date: Wed May  2 20:43:28 2012
New Revision: 1333188

URL: http://svn.apache.org/viewvc?rev=1333188&view=rev
Log:
TOMEE-183 some refactoring to avoid too much duplicated for ejb jar

Modified:
    
openejb/trunk/openejb/arquillian-tomee/arquillian-openejb-container/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java

Modified: 
openejb/trunk/openejb/arquillian-tomee/arquillian-openejb-container/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-openejb-container/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java?rev=1333188&r1=1333187&r2=1333188&view=diff
==============================================================================
--- 
openejb/trunk/openejb/arquillian-tomee/arquillian-openejb-container/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java
 (original)
+++ 
openejb/trunk/openejb/arquillian-tomee/arquillian-openejb-container/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java
 Wed May  2 20:43:28 2012
@@ -8,12 +8,13 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.OpenEJBRuntimeException;
 import org.apache.openejb.config.AppModule;
 import org.apache.openejb.config.EjbModule;
 import org.apache.openejb.config.PersistenceModule;
 import org.apache.openejb.config.ReadDescriptors;
 import org.apache.openejb.jee.EjbJar;
-import org.apache.openejb.jee.JaxbJavaee;
 import org.apache.openejb.jee.ManagedBean;
 import org.apache.openejb.jee.TransactionType;
 import org.apache.openejb.jee.jpa.unit.JaxbPersistenceFactory;
@@ -72,21 +73,11 @@ public class OpenEJBArchiveProcessor imp
         final EjbJar ejbJar;
         final Node ejbJarXml = archive.get(META_INF.concat(EJB_JAR_XML));
         if (ejbJarXml != null) {
-            EjbJar readEjbJar = null;
-            LengthInputStream lis = null;
             try {
-                lis = new LengthInputStream(ejbJarXml.getAsset().openStream());
-                readEjbJar = (EjbJar) JaxbJavaee.unmarshalJavaee(EjbJar.class, 
lis);
-            } catch (Exception e) {
-                if (lis != null && lis.getLength() == 0) {
-                    readEjbJar = new EjbJar();
-                } else {
-                    LOGGER.log(Level.SEVERE, "can't read ejb-jar.xml", e);
-                }
-            } finally {
-                IO.close(lis);
+                ejbJar = 
ReadDescriptors.readEjbJar(ejbJarXml.getAsset().openStream());
+            } catch (OpenEJBException e) {
+                throw new OpenEJBRuntimeException(e);
             }
-            ejbJar = readEjbJar;
         } else {
             ejbJar = new EjbJar();
         }