You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by js...@apache.org on 2005/07/19 13:36:50 UTC
svn commit: r219658 - /geronimo/branches/v1_0_M4-QA/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/TemporaryPlanAdapter.java

Author: jsisson
Date: Tue Jul 19 04:36:50 2005
New Revision: 219658

URL: http://svn.apache.org/viewcvs?rev=219658&view=rev
Log:
GERONIMO-773 Improve Error messages in the Jetty deployment TemporaryPlanAdapter

Modified:
    geronimo/branches/v1_0_M4-QA/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/TemporaryPlanAdapter.java

Modified: geronimo/branches/v1_0_M4-QA/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/TemporaryPlanAdapter.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/v1_0_M4-QA/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/TemporaryPlanAdapter.java?rev=219658&r1=219657&r2=219658&view=diff
==============================================================================
--- geronimo/branches/v1_0_M4-QA/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/TemporaryPlanAdapter.java (original)
+++ geronimo/branches/v1_0_M4-QA/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/TemporaryPlanAdapter.java Tue Jul 19 04:36:50 2005
@@ -46,7 +46,11 @@
         }
 
         if(WRONG_NAMESPACE.equals(cursor.getName().getNamespaceURI())) {
-            log.error("WAR includes a file using the old geronimo-jetty.xml format (including namespace http://geronimo.apache.org/xml/ns/web/jetty).  This is no longer supported.  Please change to the new geronimo-web.xml format.  The main difference is that it uses the namespace http://geronimo.apache.org/xml/ns/web");
+            log.error("WAR includes a file using the old geronimo-jetty.xml format "+
+                "(including namespace http://geronimo.apache.org/xml/ns/web/jetty). "+
+                "While we're still using your file for now, the next release will not, "+
+                "and you should change to the new geronimo-web.xml format immediately. "+
+                "The main difference is that it uses the namespace http://geronimo.apache.org/xml/ns/web");
             swapNamespace(cursor, CORRECT_NAMESPACE, WRONG_NAMESPACE);
         }
 
@@ -67,7 +71,11 @@
         }
 
         if(WRONG_NAMESPACE.equals(cursor.getName().getNamespaceURI())) {
-            log.error("EAR includes WAR deployment content using the old geronimo-jetty.xml format (including namespace http://geronimo.apache.org/xml/ns/web/jetty).  This is no longer supported.  Please change to the new geronimo-web.xml format.  The main difference is that it uses the namespace http://geronimo.apache.org/xml/ns/web");
+            log.error("EAR includes WAR deployment content using the old geronimo-jetty.xml format "+
+                "(including namespace http://geronimo.apache.org/xml/ns/web/jetty). "+
+                "While we're still using your WAR deployment content for now, the next release will not, "+
+                "and you should change to the new geronimo-web.xml format immediately. "+
+                "The main difference is that it uses the namespace http://geronimo.apache.org/xml/ns/web");
             swapNamespace(cursor, CORRECT_NAMESPACE, WRONG_NAMESPACE);
         }