Author: vsiveton Date: Sun May 6 09:05:47 2007 New Revision: 535632 URL: http://svn.apache.org/viewvc?view=rev&rev=535632 Log: o consolidated sandbok after Jason's changes
o added new doxia-module-* as dependencies o fixed ref for HtmlTools o fixed the book.mdo to start with book o removed plexus-container-default http://www.nabble.com/doxia-not-compilable--tf3694292s177.html Modified: maven/sandbox/trunk/doxia/doxia-book/pom.xml maven/sandbox/trunk/doxia/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/XdocBookRenderer.java maven/sandbox/trunk/doxia/doxia-book/src/main/modello/book.mdo maven/sandbox/trunk/doxia/doxia-book/src/test/java/org/apache/maven/doxia/book/services/indexer/BookIndexerTest.java maven/sandbox/trunk/doxia/doxia-editor/pom.xml Modified: maven/sandbox/trunk/doxia/doxia-book/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-book/pom.xml?view=diff&rev=535632&r1=535631&r2=535632 ============================================================================== --- maven/sandbox/trunk/doxia/doxia-book/pom.xml (original) +++ maven/sandbox/trunk/doxia/doxia-book/pom.xml Sun May 6 09:05:47 2007 @@ -41,16 +41,31 @@ <groupId>${project.groupId}</groupId> <artifactId>doxia-core</artifactId> <version>1.0-alpha-9-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>doxia-module-itext</artifactId> - <version>1.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - <version>1.0-alpha-10</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>doxia-module-xdoc</artifactId> + <version>1.0-alpha-9-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>doxia-module-xhtml</artifactId> + <version>1.0-alpha-9-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>doxia-module-apt</artifactId> + <version>1.0-alpha-9-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>doxia-module-itext</artifactId> + <version>1.0-alpha-9-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>doxia-module-latex</artifactId> + <version>1.0-alpha-9-SNAPSHOT</version> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> Modified: maven/sandbox/trunk/doxia/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/XdocBookRenderer.java URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/XdocBookRenderer.java?view=diff&rev=535632&r1=535631&r2=535632 ============================================================================== --- maven/sandbox/trunk/doxia/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/XdocBookRenderer.java (original) +++ maven/sandbox/trunk/doxia/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/XdocBookRenderer.java Sun May 6 09:05:47 2007 @@ -40,11 +40,11 @@ import org.apache.maven.doxia.book.services.renderer.xdoc.SectionXdocBookSink; import org.apache.maven.doxia.editor.io.PipelineSink; import org.apache.maven.doxia.index.IndexEntry; -import org.apache.maven.doxia.module.HtmlTools; import org.apache.maven.doxia.module.xdoc.XdocSink; import org.apache.maven.doxia.parser.ParseException; import org.apache.maven.doxia.parser.manager.ParserNotFoundException; import org.apache.maven.doxia.sink.Sink; +import org.apache.maven.doxia.util.HtmlTools; import org.codehaus.plexus.i18n.I18N; import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.util.StringUtils; Modified: maven/sandbox/trunk/doxia/doxia-book/src/main/modello/book.mdo URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-book/src/main/modello/book.mdo?view=diff&rev=535632&r1=535631&r2=535632 ============================================================================== --- maven/sandbox/trunk/doxia/doxia-book/src/main/modello/book.mdo (original) +++ maven/sandbox/trunk/doxia/doxia-book/src/main/modello/book.mdo Sun May 6 09:05:47 2007 @@ -17,18 +17,18 @@ * limitations under the License. */ --> - + <model> <id>book</id> <name>BookModel</name> <description> <![CDATA[ <p> - This descriptor specifies the metadatas and the content for + This descriptor specifies the metadatas and the content for a book. </p> <p> - A book is defined by a collection of chapters, a chapter by a + A book is defined by a collection of chapters, a chapter by a collection of sections, a section by a file. </p> ]]> @@ -40,7 +40,7 @@ </default> </defaults> <classes> - <class rootElement="true" xml.tagName="project"> + <class rootElement="true" xml.tagName="book"> <name>BookModel</name> <description> Describes the book layout and packaging. Modified: maven/sandbox/trunk/doxia/doxia-book/src/test/java/org/apache/maven/doxia/book/services/indexer/BookIndexerTest.java URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-book/src/test/java/org/apache/maven/doxia/book/services/indexer/BookIndexerTest.java?view=diff&rev=535632&r1=535631&r2=535632 ============================================================================== --- maven/sandbox/trunk/doxia/doxia-book/src/test/java/org/apache/maven/doxia/book/services/indexer/BookIndexerTest.java (original) +++ maven/sandbox/trunk/doxia/doxia-book/src/test/java/org/apache/maven/doxia/book/services/indexer/BookIndexerTest.java Sun May 6 09:05:47 2007 @@ -23,7 +23,7 @@ import org.apache.maven.doxia.book.model.BookModel; import org.apache.maven.doxia.book.services.io.BookIo; import org.apache.maven.doxia.index.IndexEntry; -import org.apache.maven.doxia.module.HtmlTools; +import org.apache.maven.doxia.util.HtmlTools; import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.util.FileUtils; Modified: maven/sandbox/trunk/doxia/doxia-editor/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-editor/pom.xml?view=diff&rev=535632&r1=535631&r2=535632 ============================================================================== --- maven/sandbox/trunk/doxia/doxia-editor/pom.xml (original) +++ maven/sandbox/trunk/doxia/doxia-editor/pom.xml Sun May 6 09:05:47 2007 @@ -36,9 +36,9 @@ <version>1.0-alpha-9-SNAPSHOT</version> </dependency> <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - <version>1.0-alpha-8</version> + <groupId>${project.groupId}</groupId> + <artifactId>doxia-module-xdoc</artifactId> + <version>1.0-alpha-9-SNAPSHOT</version> </dependency> </dependencies> </project>
