You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2006/06/05 06:56:14 UTC
svn commit: r411663 -
/geronimo/trunk/modules/j2ee-schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java
Author: djencks
Date: Sun Jun 4 21:56:14 2006
New Revision: 411663
URL: http://svn.apache.org/viewvc?rev=411663&view=rev
Log:
GERONIMO-1411 backport schema conversion fixed from dead-1.2
Modified:
geronimo/trunk/modules/j2ee-schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java
Modified: geronimo/trunk/modules/j2ee-schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/j2ee-schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java?rev=411663&r1=411662&r2=411663&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java (original)
+++ geronimo/trunk/modules/j2ee-schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java Sun Jun 4 21:56:14 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();
}