svn commit: r1142517 - in /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb: OpenEjbContainer.java assembler/classic/Assembler.java

[rm...@apache.org]

Author: rmannibucau
Date: Sun Jul  3 22:57:12 2011
New Revision: 1142517

URL: http://svn.apache.org/viewvc?rev=1142517&view=rev
Log:
keeping ValidationException as this when it is thrown cause of misconfiguration

Modified:
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java?rev=1142517&r1=1142516&r2=1142517&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java Sun Jul  3 22:57:12 2011
@@ -16,6 +16,7 @@
  */
 package org.apache.openejb;
 
+import javax.validation.ValidationException;
 import org.apache.openejb.assembler.classic.AppInfo;
 import org.apache.openejb.assembler.classic.Assembler;
 import org.apache.openejb.cdi.OWBInjector;
@@ -270,6 +271,8 @@ public class OpenEjbContainer extends EJ
 
                 try {
                     appContext = assembler.createApplication(appInfo, appModule.getClassLoader());
+                } catch (ValidationException ve) {
+                    throw ve;
                 } catch (Exception e) {
                     throw new AssembleApplicationException(e);
                 }
@@ -285,6 +288,8 @@ public class OpenEjbContainer extends EJ
 
                 throw new EJBException(e);
 
+            } catch (ValidationException ve) {
+                throw ve;
             } catch (Exception e) {
 
                 if (e instanceof EJBException) {

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1142517&r1=1142516&r2=1142517&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java Sun Jul  3 22:57:12 2011
@@ -16,25 +16,10 @@
  */
 package org.apache.openejb.assembler.classic;
 
-import java.io.File;
-import java.io.IOException;
-import java.lang.instrument.ClassFileTransformer;
-import java.lang.instrument.Instrumentation;
-import java.lang.management.ManagementFactory;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.atomic.AtomicInteger;
-
 import javax.management.InstanceNotFoundException;
-import javax.management.MalformedObjectNameException;
 import javax.management.MBeanRegistrationException;
 import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 import javax.naming.Binding;
 import javax.naming.Context;
@@ -52,8 +37,8 @@ import javax.resource.spi.XATerminator;
 import javax.resource.spi.work.WorkManager;
 import javax.transaction.TransactionManager;
 import javax.transaction.TransactionSynchronizationRegistry;
+import javax.validation.ValidationException;
 import javax.validation.ValidatorFactory;
-
 import org.apache.geronimo.connector.work.GeronimoWorkManager;
 import org.apache.geronimo.connector.work.TransactionContextHandler;
 import org.apache.geronimo.connector.work.WorkContextHandler;
@@ -112,6 +97,32 @@ import org.apache.xbean.recipe.ObjectRec
 import org.apache.xbean.recipe.Option;
 import org.apache.xbean.recipe.UnsetPropertiesRecipe;
 
+import java.io.File;
+import java.io.IOException;
+import java.lang.instrument.ClassFileTransformer;
+import java.lang.instrument.Instrumentation;
+import java.lang.management.ManagementFactory;
+import java.lang.reflect.Method;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Properties;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicInteger;
+
 public class Assembler extends AssemblerTool implements org.apache.openejb.spi.Assembler {
 
     static {
@@ -786,13 +797,14 @@ public class Assembler extends Assembler
             appContext.getDeployments().addAll(allDeployments);
 
             return appContext;
+        } catch (ValidationException ve) {
+            throw ve;
         } catch (Throwable t) {
             try {
                 destroyApplication(appInfo);
             } catch (Exception e1) {
                 logger.debug("createApplication.undeployFailed", e1, appInfo.path);
             }
-
             throw new OpenEJBException(messages.format("createApplication.failed", appInfo.path), t);
         }
     }