svn commit: r561752 - in /maven/doxia/doxia/branches/doxia-modules: ./ doxia-module-xdoc/
Author: vsiveton Date: Wed Aug 1 03:22:27 2007 New Revision: 561752 URL: http://svn.apache.org/viewvc?view=rev&rev=561752 Log: o created structure Added: maven/doxia/doxia/branches/doxia-modules/ maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/
svn commit: r561753 - /maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123/
Author: vsiveton Date: Wed Aug 1 03:23:22 2007 New Revision: 561753 URL: http://svn.apache.org/viewvc?view=rev&rev=561753 Log: Initiated branch for DOXIA-123 Added: maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123/ - copied from r561752, maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/
svn commit: r561788 [3/3] - in /maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123: pom.xml src/main/resources/xdoc-2.0.xsd src/test/resources/test-xdoc-xsd.xml
Added: maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123/src/test/resources/test-xdoc-xsd.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123/src/test/resources/test-xdoc-xsd.xml?view=auto&rev=561788 == --- maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123/src/test/resources/test-xdoc-xsd.xml (added) +++ maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123/src/test/resources/test-xdoc-xsd.xml Wed Aug 1 05:49:04 2007 @@ -0,0 +1,63 @@ + + + + +http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 ../../main/resources/xdoc-2.0.xsd"> + + +Test Xdoc XSD +Vincent Siveton + + + + +This page test the new Xdoc schema for http://maven.apache.org/doxia";>Doxia. + + Documentation + +item 1 +item 2 + +item 21 +item 22 + + + + Additional + +TOTO + + Example + + + +Subsection + + + + + + + + Propchange: maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123/src/test/resources/test-xdoc-xsd.xml -- svn:eol-style = native Propchange: maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123/src/test/resources/test-xdoc-xsd.xml -- svn:keywords = "Author Date Id Revision"
svn commit: r561788 [1/3] - in /maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123: pom.xml src/main/resources/xdoc-2.0.xsd src/test/resources/test-xdoc-xsd.xml
Author: vsiveton Date: Wed Aug 1 05:49:04 2007 New Revision: 561788 URL: http://svn.apache.org/viewvc?view=rev&rev=561788 Log: o first add of xdoc-2.0.xsd o added a test xdoc file to play with the new xsd o updated pom to include xsddoc (XML Schema documentation generator) ant task for the site phase Added: maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123/src/main/resources/xdoc-2.0.xsd (with props) maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123/src/test/resources/test-xdoc-xsd.xml (with props) Modified: maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123/pom.xml Modified: maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123/pom.xml?view=diff&rev=561788&r1=561787&r2=561788 == --- maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123/pom.xml (original) +++ maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123/pom.xml Wed Aug 1 05:49:04 2007 @@ -12,6 +12,53 @@ +org.apache.maven.plugins +maven-antrun-plugin + + +site + + + + + + + + + + + + + + + + + + run + + + + + + +xsddoc +xsddoc +1.0 + + +xalan +xalan +2.7.0 + + + + org.codehaus.plexus plexus-maven-plugin @@ -30,5 +77,4 @@ -
svn commit: r561789 - /maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123/
Author: vsiveton Date: Wed Aug 1 05:50:18 2007 New Revision: 561789 URL: http://svn.apache.org/viewvc?view=rev&rev=561789 Log: o ignored idea files Modified: maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123/ (props changed) Propchange: maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123/ -- --- svn:ignore (original) +++ svn:ignore Wed Aug 1 05:50:18 2007 @@ -1,3 +1,6 @@ target .classpath .project +doxia-module-xdoc.iml +doxia-module-xdoc.ipr +doxia-module-xdoc.iws
svn commit: r561795 - /maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java
Author: vsiveton
Date: Wed Aug 1 06:45:21 2007
New Revision: 561795
URL: http://svn.apache.org/viewvc?view=rev&rev=561795
Log:
o split up the long parseXhtml() method into parts (see r557536)
o Clean up Exception handling.
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java?view=diff&rev=561795&r1=561794&r2=561795
==
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java
Wed Aug 1 06:45:21 2007
@@ -79,20 +79,19 @@
parseXhtml( parser, sink );
}
-catch ( Exception ex )
+catch ( XmlPullParserException ex )
{
-throw new ParseException( "Error parsing the model.", ex );
+throw new ParseException( "Error parsing the model!", ex );
}
}
-
/**
* @param parser
* @param sink
* @throws IOException if any
* @throws XmlPullParserException if any
*/
-public void parseXhtml( XmlPullParser parser, Sink sink ) throws
XmlPullParserException, IOException
+public void parseXhtml( XmlPullParser parser, Sink sink ) throws
XmlPullParserException
{
int eventType = parser.getEventType();
@@ -100,256 +99,294 @@
{
if ( eventType == XmlPullParser.START_TAG )
{
-if ( parser.getName().equals( Tag.TITLE.toString() ) )
-{
-sink.title();
-}
-/*
- * The ADDRESS element may be used by authors to supply
contact information
- * for a model or a major part of a model such as a form. This
element
- * often appears at the beginning or end of a model.
- */
-else if ( parser.getName().equals( Tag.ADDRESS.toString() ) )
-{
-sink.author();
-}
-else if ( parser.getName().equals( Tag.BODY.toString() ) )
-{
-sink.body();
-}
-else if ( parser.getName().equals( Tag.H1.toString() ) ||
parser.getName().equals( Tag.H2.toString() ) ||
-parser.getName().equals( Tag.H3.toString() ) ||
parser.getName().equals( Tag.H4.toString() ) ||
-parser.getName().equals( Tag.H5.toString() ) )
-{
-this.closeSubordinatedSections( parser.getName(), sink );
-this.startSection( this.sections.size(), sink );
-this.startSectionTitle( this.sections.size(), sink );
-this.sections.push( parser.getName() );
+handleStartTag( parser, sink );
+}
+else if ( eventType == XmlPullParser.END_TAG )
+{
+handleEndTag( parser, sink );
+}
+else if ( eventType == XmlPullParser.TEXT )
+{
+handleText( parser, sink );
+}
-}
-else if ( parser.getName().equals( Tag.P.toString() ) )
-{
-sink.paragraph();
-}
-/*
- * The PRE element tells visual user agents that the enclosed
text is
- * "preformatted". When handling preformatted text, visual
user agents:
- * - May leave white space intact.
- * - May render text with a fixed-pitch font.
- * - May disable automatic word wrap.
- * - Must not disable bidirectional processing.
- * Non-visual user agents are not required to respect extra
white space
- * in the content of a PRE element.
- */
-else if ( parser.getName().equals( Tag.PRE.toString() ) )
-{
-sink.verbatim( true );
-}
-else if ( ( parser.getName().equals( Tag.CODE.toString() ) )
|| ( parser.getName().equals( Tag.SAMP.toString() ) ) ||
-( parser.getName().equals( Tag.TT.toString() ) ) )
-{
-sink.monospaced();
-}
-else if ( parser.getName().equals( Tag.UL.toString() ) )
-{
-sink.list();
-}
-else if ( parser.getName()
svn commit: r561966 - /maven/doxia/doxia-sitetools/trunk/
Author: dennisl Date: Wed Aug 1 14:41:11 2007 New Revision: 561966 URL: http://svn.apache.org/viewvc?view=rev&rev=561966 Log: o Ignore IDEA files. Modified: maven/doxia/doxia-sitetools/trunk/ (props changed) Propchange: maven/doxia/doxia-sitetools/trunk/ -- --- svn:ignore (original) +++ svn:ignore Wed Aug 1 14:41:11 2007 @@ -1 +1,4 @@ target +*.iml +*.ipr +*.iws
