geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r902940 - /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Date Mon, 25 Jan 2010 19:26:43 GMT
Author: gawor
Date: Mon Jan 25 19:26:43 2010
New Revision: 902940

URL: http://svn.apache.org/viewvc?rev=902940&view=rev
Log:
minor fix

Modified:
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?rev=902940&r1=902939&r2=902940&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Mon Jan 25 19:26:43 2010
@@ -363,7 +363,7 @@
                         if (path == null) {
                             path = deployable.getResource("WEB-INF/geronimo-tomcat.xml");
                         }
-                        if (plan == null) {
+                        if (path == null) {
                             log.warn("Web application " + targetPath + " does not contain
a WEB-INF/geronimo-web.xml deployment plan.  This may or may not be a problem, depending on
whether you have things like resource references that need to be resolved.  You can also give
the deployer a separate deployment plan file on the command line.");                     
      
                         } else {
                             rawPlan = XmlBeansUtil.parse(path, getClass().getClassLoader());



Mime
View raw message