geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsis...@apache.org
Subject svn commit: r219657 - /geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/TemporaryPlanAdapter.java
Date Tue, 19 Jul 2005 11:35:42 GMT
Author: jsisson
Date: Tue Jul 19 04:35:41 2005
New Revision: 219657

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

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

Modified: geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/TemporaryPlanAdapter.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/TemporaryPlanAdapter.java?rev=219657&r1=219656&r2=219657&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/TemporaryPlanAdapter.java
(original)
+++ geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/TemporaryPlanAdapter.java
Tue Jul 19 04:35:41 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);
         }
 



Mime
View raw message