Index: src/test/java/org/codehaus/modello/generator/xml/stax/StaxGeneratorUnrecognizedTagTest.java
===================================================================
--- src/test/java/org/codehaus/modello/generator/xml/stax/StaxGeneratorUnrecognizedTagTest.java (revision 0)
+++ src/test/java/org/codehaus/modello/generator/xml/stax/StaxGeneratorUnrecognizedTagTest.java (revision 0)
@@ -0,0 +1,22 @@
+package org.codehaus.modello.generator.xml.stax;
+
+import org.codehaus.modello.model.Model;
+import org.codehaus.plexus.util.ReaderFactory;
+
+public class StaxGeneratorUnrecognizedTagTest
+ extends AbstractStaxGeneratorTestCase
+{
+ public StaxGeneratorUnrecognizedTagTest()
+ {
+ super( "stax-unrecognized-tag" );
+ }
+
+ public void testStaxReaderStrictUnrecognizedTag()
+ throws Throwable
+ {
+ Model model =
+ modello.loadModel( ReaderFactory.newXmlReader( getTestFile( "src/test/resources/unrecognized-tag.mdo" ) ) );
+
+ verifyModel( model, "org.codehaus.modello.generator.xml.stax.StaxVerifierUnrecognizedTag" );
+ }
+}
Index: src/test/resources/unrecognized-tag.mdo
===================================================================
--- src/test/resources/unrecognized-tag.mdo (revision 0)
+++ src/test/resources/unrecognized-tag.mdo (revision 0)
@@ -0,0 +1,197 @@
+
+
+
+ maven
+ UnrecognizedTag
+
+
+ package
+ org.codehaus.modello.test.model.ut
+
+
+
+
+
+ ContinuumDatabase
+ 1.0.9+
+
+
+ projectGroups
+ 1.0.9+
+
+ ProjectGroup
+ *
+
+
+
+
+
+
+ ProjectGroup
+ 1.0.9+
+
+
+ id
+ 1.0.9+
+ true
+ int
+ true
+
+
+ groupId
+ 1.0.9+
+ String
+
+
+ name
+ 1.0.9+
+ String
+
+
+ description
+ 1.0.9+
+ String
+
+
+ projects
+ 1.0.9+
+
+ Project
+ *
+
+
+
+
+
+
+ Project
+ 1.0.9+
+
+
+ id
+ true
+ true
+ 1.0.9+
+ int
+
+
+ groupId
+ 1.0.9+
+ String
+
+
+ artifactId
+ 1.0.9+
+ String
+
+
+ executorId
+ 1.0.9+
+ String
+
+
+ name
+ 1.0.9+
+ String
+
+
+ description
+ 1.0.9+
+ String
+
+
+ url
+ 1.0.9+
+ String
+
+
+ scmUrl
+ 1.0.9+
+ String
+
+
+ scmTag
+ 1.0.9+
+ String
+
+
+ scmUsername
+ 1.0.9+
+ String
+
+
+ scmPassword
+ 1.0.9+
+ String
+
+
+ scmUseCache
+ 1.1.0+
+ boolean
+ false
+
+
+ version
+ 1.0.9+
+ String
+
+
+ state
+ 1.0.9
+ int
+ 1
+
+
+ oldState
+ 1.0.9+
+ int
+
+
+ latestBuildId
+ 1.0.9+
+ int
+
+
+ buildNumber
+ 1.0.9+
+ int
+
+
+ workingDirectory
+ 1.0.9+
+ String
+
+
+ relativePath
+ 1.1.0+
+ String
+
+
+ projectGroup
+ 1.0.9+
+ true
+
+ ProjectGroup
+
+
+
+
+
+
Index: src/test/verifiers/stax-unrecognized-tag/unrecognized-tag.xml
===================================================================
--- src/test/verifiers/stax-unrecognized-tag/unrecognized-tag.xml (revision 0)
+++ src/test/verifiers/stax-unrecognized-tag/unrecognized-tag.xml (revision 0)
@@ -0,0 +1,38 @@
+
+
+
+
+ 1
+ default
+ Default Project Group
+ Contains all projects that do not have a group of their own
+
+
+ 6
+ com.exist.apps
+ Maven Quick Start Archetype
+
+
+ 1
+ com.exist.apps
+ quickstart
+ maven2
+ Maven Quick Start Archetype
+ http://stan.manila.exist.com
+ scm:svn:http://stan.manila.exist.com/repos/quickstart/trunk
+ 3.12-SNAPSHOT
+ 2
+ 10
+ 1
+ 1
+ 1
+
+
+ true
+ /bin/sh -c cd /home/marica/maestro/maestro-2.1.1/project-server/data/continuum/working-directory/1 && svn --non-interactive update /home/marica/maestro/maestro-2.1.1/project-server/data/continuum/working-directory/1
+
+
+
+
+
+
Index: src/test/verifiers/stax-unrecognized-tag/StaxVerifierUnrecognizedTag.java
===================================================================
--- src/test/verifiers/stax-unrecognized-tag/StaxVerifierUnrecognizedTag.java (revision 0)
+++ src/test/verifiers/stax-unrecognized-tag/StaxVerifierUnrecognizedTag.java (revision 0)
@@ -0,0 +1,59 @@
+package org.codehaus.modello.generator.xml.stax;
+
+/*
+ * Copyright (c) 2004, Codehaus.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+import junit.framework.Assert;
+import org.codehaus.modello.test.model.ut.ContinuumDatabase;
+import org.codehaus.modello.test.model.ut.io.stax.UnrecognizedTagStaxReader;
+import org.codehaus.modello.verifier.Verifier;
+import org.codehaus.plexus.util.ReaderFactory;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.Reader;
+import javax.xml.stream.XMLStreamException;
+
+public class StaxVerifierUnrecognizedTag
+ extends Verifier
+{
+ public void verify()
+ throws IOException, XMLStreamException
+ {
+ File file = new File( "src/test/verifiers/stax-unrecognized-tag/unrecognized-tag.xml" );
+
+ UnrecognizedTagStaxReader modelReader = new UnrecognizedTagStaxReader();
+
+ Reader reader = ReaderFactory.newXmlReader( file );
+
+ try
+ {
+ ContinuumDatabase model = modelReader.read( reader, false );
+
+ Assert.assertEquals( 2, model.getProjectGroups().size() );
+ }
+ catch ( XMLStreamException e )
+ {
+ Assert.fail( "Should not have obtained any exception" );
+ }
+ }
+}
Index: src/main/java/org/codehaus/modello/plugin/stax/StaxReaderGenerator.java
===================================================================
--- src/main/java/org/codehaus/modello/plugin/stax/StaxReaderGenerator.java (revision 1300)
+++ src/main/java/org/codehaus/modello/plugin/stax/StaxReaderGenerator.java (working copy)
@@ -726,6 +726,35 @@
+ "\"'\", xmlStreamReader.getLocation() );" );
sc.add( "}" );
+ sc.add( "else" );
+
+ sc.add( "{" );
+
+ sc.addIndented( "int unrecognizedTagCtr = 1;" );
+ sc.addIndented( "while( unrecognizedTagCtr != 0 )" );
+
+ sc.indent();
+ sc.add( "{" );
+
+ sc.addIndented( "xmlStreamReader.next();" );
+ sc.addIndented( "if ( xmlStreamReader.getEventType() == XMLStreamConstants.START_ELEMENT )" );
+
+ sc.indent();
+ sc.add( "{" );
+ sc.addIndented( "unrecognizedTagCtr++;" );
+ sc.add( "}" );
+
+ sc.add( "else if ( xmlStreamReader.getEventType() == XMLStreamConstants.END_ELEMENT )" );
+ sc.add( "{" );
+ sc.addIndented( "unrecognizedTagCtr--;" );
+ sc.add( "}" );
+
+ sc.unindent();
+ sc.add( "}" );
+
+ sc.unindent();
+ sc.add( "}" );
+
if ( addElse )
{
sc.unindent();
@@ -751,6 +780,30 @@
+ "\"'\", xmlStreamReader.getLocation() );" );
sc.add( "}" );
+ sc.add( "else" );
+
+ sc.add( "{" );
+
+ sc.addIndented( "int unrecognizedTagCtr = 1;" );
+ sc.addIndented( "while( unrecognizedTagCtr != 0 )" );
+
+ sc.indent();
+ sc.add( "{" );
+
+ sc.addIndented( "xmlStreamReader.next();" );
+ sc.addIndented( "if ( xmlStreamReader.getEventType() == XMLStreamConstants.START_ELEMENT )" );
+
+ sc.indent();
+
+ sc.add( "{" );
+ sc.addIndented( "unrecognizedTagCtr++;" );
+ sc.add( "}" );
+
+ sc.add( "else if ( xmlStreamReader.getEventType() == XMLStreamConstants.END_ELEMENT )" );
+ sc.add( "{" );
+ sc.addIndented( "unrecognizedTagCtr--;" );
+ sc.add( "}" );
+
sc.unindent();
sc.add( "}" );
@@ -759,6 +812,12 @@
sc.unindent();
sc.add( "}" );
+
+ sc.unindent();
+ sc.add( "}" );
+
+ sc.unindent();
+ sc.add( "}" );
}
sc.unindent();