geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject svn commit: r511216 - /geronimo/server/branches/2.0-M3/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
Date Sat, 24 Feb 2007 05:29:32 GMT
Author: dblevins
Date: Fri Feb 23 21:29:25 2007
New Revision: 511216

URL: http://svn.apache.org/viewvc?view=rev&rev=511216
Log:
Deployment fix from trunk.  builder now properly passes on all non-ejb modules.

Modified:
    geronimo/server/branches/2.0-M3/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java

Modified: geronimo/server/branches/2.0-M3/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M3/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java?view=diff&rev=511216&r1=511215&r2=511216
==============================================================================
--- geronimo/server/branches/2.0-M3/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
(original)
+++ geronimo/server/branches/2.0-M3/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
Fri Feb 23 21:29:25 2007
@@ -56,6 +56,7 @@
 import org.apache.openejb.config.AppModule;
 import org.apache.openejb.config.DeploymentLoader;
 import org.apache.openejb.config.ReadDescriptors;
+import org.apache.openejb.config.UnsupportedModuleTypeException;
 import org.apache.openejb.jee.EjbJar;
 import org.apache.openejb.jee.EnterpriseBean;
 import org.apache.openejb.jee.MessageDestinationRef;
@@ -152,10 +153,9 @@
         AppModule appModule = null;
         try {
             appModule = loader.load(new File(moduleFile.getName()));
+        } catch (UnsupportedModuleTypeException e){
+            return null;
         } catch (OpenEJBException e) {
-            if (e.getMessage().startsWith("Unsupported module type")) {
-                return null;
-            }
             throw new DeploymentException(e);
         }
 



Mime
View raw message