tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1239514 - /openejb/branches/generated-descriptors/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
Date Thu, 02 Feb 2012 10:09:43 GMT
Author: rmannibucau
Date: Thu Feb  2 10:09:43 2012
New Revision: 1239514

URL: http://svn.apache.org/viewvc?rev=1239514&view=rev
Log:
shouldn't be client module checked after ejbmodule?

Modified:
    openejb/branches/generated-descriptors/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java

Modified: openejb/branches/generated-descriptors/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
URL: http://svn.apache.org/viewvc/openejb/branches/generated-descriptors/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=1239514&r1=1239513&r2=1239514&view=diff
==============================================================================
--- openejb/branches/generated-descriptors/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
(original)
+++ openejb/branches/generated-descriptors/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
Thu Feb  2 10:09:43 2012
@@ -1461,10 +1461,6 @@ public class DeploymentLoader implements
             return AppModule.class;
         }
 
-        if (descriptors.containsKey("application-client.xml")) {
-            return ClientModule.class;
-        }
-
         if (descriptors.containsKey("ra.xml") || path.endsWith(".rar")) {
             return ConnectorModule.class;
         }
@@ -1481,6 +1477,10 @@ public class DeploymentLoader implements
             return EjbModule.class;
         }
 
+        if (descriptors.containsKey("application-client.xml")) {
+            return ClientModule.class;
+        }
+
         final URL manifestUrl = descriptors.get("MANIFEST.MF");
         if (scanPotentialClientModules && manifestUrl != null) {
             // In this case scanPotentialClientModules really means "require application-client.xml"



Mime
View raw message