geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r224434 - /geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
Date Sat, 23 Jul 2005 03:12:12 GMT
Author: ammulder
Date: Fri Jul 22 20:12:09 2005
New Revision: 224434

URL: http://svn.apache.org/viewcvs?rev=224434&view=rev
Log:
When complaining about a missing DD, make it complain about the new file
  name not the old file name.  Also, give a more verbose and meaningful
  message.  Not sure whether it should really be WARN, but I guess we can
  get some user feedback on that.

Modified:
    geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java

Modified: geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java?rev=224434&r1=224433&r2=224434&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
(original)
+++ geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
Fri Jul 22 20:12:09 2005
@@ -295,10 +295,14 @@
                             jettyWebAppdoc = GerWebAppDocument.Factory.parse(path);
                         } catch (FileNotFoundException e) {
                             path = DeploymentUtil.createJarURL(moduleFile, "WEB-INF/geronimo-jetty.xml");
-                            XmlObject object = SchemaConversionUtils.parse(path);
-                            if (object != null) {
-                                log.error("Incorrect deployment plan naming: found geronimo-jetty.xml,
should be geronimo-web.xml");
-                                jettyWebAppdoc = TemporaryPlanAdapter.convertJettyDocumentToWeb(object);
+                            try {
+                                XmlObject object = SchemaConversionUtils.parse(path);
+                                if (object != null) {
+                                    log.error("Incorrect deployment plan naming: found geronimo-jetty.xml,
should be geronimo-web.xml");
+                                    jettyWebAppdoc = TemporaryPlanAdapter.convertJettyDocumentToWeb(object);
+                                }
+                            } catch (FileNotFoundException e1) {
+                                log.warn("Web application 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.");
                             }
                         }
                     }



Mime
View raw message