geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r411661 - /geronimo/branches/1.1/modules/j2ee-schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java
Date Mon, 05 Jun 2006 04:52:47 GMT
Author: djencks
Date: Sun Jun  4 21:52:46 2006
New Revision: 411661

URL: http://svn.apache.org/viewvc?rev=411661&view=rev
Log:
GERONIMO-1411 backport schema conversion fixed from dead-1.2

Modified:
    geronimo/branches/1.1/modules/j2ee-schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java

Modified: geronimo/branches/1.1/modules/j2ee-schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/j2ee-schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java?rev=411661&r1=411660&r2=411661&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java
(original)
+++ geronimo/branches/1.1/modules/j2ee-schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java
Sun Jun  4 21:52:46 2006
@@ -297,13 +297,15 @@
                     cursor.pop();
                     do {
                         String name = cursor.getName().getLocalPart();
-                        if ("filter".equals(name) || "servlet".equals(name)) {
+                        if ("filter".equals(name) || "servlet".equals(name) || "context-param".equals(name))
{
                             cursor.push();
                             cursor.toFirstChild();
                             convertToDescriptionGroup(cursor, moveable);
-                            if (cursor.toNextSibling(J2EE_NAMESPACE, "init-param")) {
+                            while (cursor.toNextSibling(J2EE_NAMESPACE, "init-param")) {
+                                cursor.push();
                                 cursor.toFirstChild();
                                 convertToDescriptionGroup(cursor, moveable);
+                                cursor.pop();
                             }
                             cursor.pop();
                         }



Mime
View raw message