svn commit: r1059838 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java

[xuhaihong]

Author: xuhaihong
Date: Mon Jan 17 09:51:07 2011
New Revision: 1059838

URL: http://svn.apache.org/viewvc?rev=1059838&view=rev
Log:
Remove the warning information and we should not change the 
loadingRequiredModuleTypes

Modified:
    
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=1059838&r1=1059837&r2=1059838&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
 Mon Jan 17 09:51:07 2011
@@ -118,16 +118,6 @@ public class DeploymentLoader implements
         } else {
             this.loadingRequiredModuleTypes = new HashSet<Class<? extends 
DeploymentModule>>(loadingRequiredModuleTypes);
             this.loadingRequiredModuleTypes.add(AppModule.class);
-            if (this.loadingRequiredModuleTypes.contains(WsModule.class)
-                    && 
!this.loadingRequiredModuleTypes.contains(EjbModule.class)) {
-                logger.warning("Could not load web service module without 
loading ejb module");
-                this.loadingRequiredModuleTypes.add(EjbModule.class);
-            }
-            if (this.loadingRequiredModuleTypes.contains(WsModule.class)
-                    && 
!this.loadingRequiredModuleTypes.contains(WebModule.class)) {
-                logger.warning("Could not load web service module without 
loading web module");
-                this.loadingRequiredModuleTypes.add(WebModule.class);
-            }
         }
     }
 
@@ -1315,18 +1305,18 @@ public class DeploymentLoader implements
         final boolean scanPotentialEjbModules = 
!requireDescriptor.contains(RequireDescriptors.EJB);
         final boolean scanPotentialClientModules = 
!requireDescriptor.contains(RequireDescriptors.CLIENT);
 
-        
+
         URL pathToScanDescriptors=baseUrl;
         String baseURLString=baseUrl.toString();
-        
+
         if (baseUrl.getProtocol().equals("file") && 
baseURLString.endsWith("WEB-INF/classes/")) {
             //EJB found in WAR/WEB-INF/classes, scan WAR for ejb-jar.xml
-            
+
             pathToScanDescriptors=new 
URL(baseURLString.substring(0,baseURLString.lastIndexOf("WEB-INF/classes/")));
 
         }
         ResourceFinder finder = new ResourceFinder("", classLoader, 
pathToScanDescriptors);
-        
+
         Map<String, URL> descriptors = 
altDDSources(finder.getResourcesMap(ddDir), false);
 
         String path = baseUrl.getPath();