tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1297405 - /openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
Date Tue, 06 Mar 2012 10:20:08 GMT
Author: rmannibucau
Date: Tue Mar  6 10:20:08 2012
New Revision: 1297405

URL: http://svn.apache.org/viewvc?rev=1297405&view=rev
Log:
trying to guess the module is a webapp without WEB-INF folder

Modified:
    openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java

Modified: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1297405&r1=1297404&r2=1297405&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
(original)
+++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
Tue Mar  6 10:20:08 2012
@@ -1052,11 +1052,11 @@ public class TomcatWebAppBuilder impleme
      * @param standardContext tomcat context instance
      * @return a openejb application module
      */
-    private AppModule loadApplication(StandardContext standardContext) {
-        ServletContext servletContext = standardContext.getServletContext();
+    private AppModule loadApplication(final StandardContext standardContext) {
+        final ServletContext servletContext = standardContext.getServletContext();
 
-        TomcatDeploymentLoader tomcatDeploymentLoader = new TomcatDeploymentLoader(standardContext,
getId(standardContext));
-        AppModule appModule = null;
+        final TomcatDeploymentLoader tomcatDeploymentLoader = new TomcatDeploymentLoader(standardContext,
getId(standardContext));
+        final AppModule appModule;
         try {
             appModule = tomcatDeploymentLoader.load(new File(servletContext.getRealPath(".")).getParentFile());
         } catch (OpenEJBException e) {



Mime
View raw message