svn commit: r519317 - in /maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook: DocBookParser.java DocBookSiteModule.java
Author: jvanzyl Date: Sat Mar 17 07:01:27 2007 New Revision: 519317 URL: http://svn.apache.org/viewvc?view=rev&rev=519317 Log: o removing explicity roles, the CDC will pick them up Modified: maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSiteModule.java Modified: maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java?view=diff&rev=519317&r1=519316&r2=519317 == --- maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java (original) +++ maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java Sat Mar 17 07:01:27 2007 @@ -39,8 +39,7 @@ * * @author mailto:[EMAIL PROTECTED]">Jason van Zyl * @version $Id:DocBookParser.java 348605 2005-11-24 12:02:44 +1100 (Thu, 24 Nov 2005) brett $ - * @plexus.component role="org.apache.maven.doxia.parser.Parser" - * role-hint="doc-book" + * @plexus.component role-hint="doc-book" */ public class DocBookParser implements Parser Modified: maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSiteModule.java URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSiteModule.java?view=diff&rev=519317&r1=519316&r2=519317 == --- maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSiteModule.java (original) +++ maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSiteModule.java Sat Mar 17 07:01:27 2007 @@ -24,8 +24,7 @@ /** * @author mailto:[EMAIL PROTECTED]">Emmanuel Venisse * @version $Id:DocBookSiteModule.java 348605 2005-11-24 12:02:44 +1100 (Thu, 24 Nov 2005) brett $ - * @plexus.component role="org.apache.maven.doxia.site.module.SiteModule" - * role-hint="doc-book" + * @plexus.component role-hint="doc-book" */ public class DocBookSiteModule extends AbstractSiteModule
svn commit: r519326 - /maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/docbook/
Author: jvanzyl Date: Sat Mar 17 07:32:19 2007 New Revision: 519326 URL: http://svn.apache.org/viewvc?view=rev&rev=519326 Log: o this is a separate module Removed: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/docbook/
svn commit: r519328 [2/2] - in /maven/doxia/trunk/doxia-modules/doxia-module-apt: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/maven/ src/main
Added:
maven/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java?view=auto&rev=519328
==
---
maven/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java
(added)
+++
maven/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java
Sat Mar 17 07:44:23 2007
@@ -0,0 +1,700 @@
+package org.apache.maven.doxia.module.apt;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.PrintWriter;
+import java.io.Writer;
+import java.util.Stack;
+
+import org.apache.maven.doxia.module.HtmlTools;
+import org.apache.maven.doxia.sink.SinkAdapter;
+import org.codehaus.plexus.util.StringUtils;
+
+/**
+ * APT Sink implementation.
+ * @author eredmond
+ */
+public class AptSink extends SinkAdapter
+{
+private static final String EOL = System.getProperty("line.separator");
+private StringBuffer buffer;
+private StringBuffer tableCaptionBuffer;
+private String author;
+private String title;
+private String date;
+private boolean tableCaptionFlag;
+private boolean headerFlag;
+private boolean bufferFlag;
+private boolean itemFlag;
+private boolean verbatimFlag;
+private boolean boxed;
+private boolean gridFlag;
+private int cellCount;
+private PrintWriter writer;
+private int cellJustif[];
+private String rowLine;
+private String listNestingIndent;
+private Stack listStyles;
+
+public AptSink( Writer writer )
+{
+ this.buffer = new StringBuffer();
+this.tableCaptionBuffer = new StringBuffer();
+this.writer = new PrintWriter(writer);
+this.listNestingIndent = "";
+this.listStyles = new Stack();
+}
+
+protected StringBuffer getBuffer()
+{
+return buffer;
+}
+
+protected void setHeadFlag(boolean headFlag)
+{
+this.headerFlag = headFlag;
+}
+
+protected void resetState()
+{
+headerFlag = false;
+resetBuffer();
+itemFlag = false;
+verbatimFlag = false;
+cellCount = 0;
+}
+
+protected void resetBuffer()
+{
+buffer = new StringBuffer();
+}
+
+protected void resetTableCaptionBuffer()
+{
+ tableCaptionBuffer = new StringBuffer();
+}
+
+public void head()
+{
+ resetState();
+ headerFlag = true;
+}
+
+public void head_()
+{
+headerFlag = false;
+
+write( " -" + EOL );
+write( " " + title + EOL );
+write( " -" + EOL );
+write( " " + author + EOL );
+write( " -" + EOL );
+write( " " + date + EOL );
+write( " -" + EOL );
+}
+
+public void title_()
+{
+if(buffer.length() > 0)
+{
+ title = buffer.toString();
+resetBuffer();
+}
+}
+
+public void author_()
+{
+if(buffer.length() > 0)
+{
+ author = buffer.toString();
+resetBuffer();
+}
+}
+
+public void date_()
+{
+if(buffer.length() > 0)
+{
+ date = buffer.toString();
+resetBuffer();
+}
+}
+
+public void section1_()
+{
+write( EOL );
+}
+
+public void section2_()
+{
+write( EOL );
+}
+
+public void section3_()
+{
+write( EOL );
+}
+
+public void section4_()
+{
+write( EOL );
+}
+
+public void section5_()
+{
+write( EOL );
+}
+
+public void sectionTitle1()
+{
+write( EOL );
+}
+
+public void sectionTitle1_()
+{
+write( EOL + EOL );
+}
+
+public void sectionTitle2()
+{
+write( EOL + "*" );
+}
+
+public void sectionTitle2_()
+{
+write( EOL + EOL );
+}
+
+public void sectionTitle3()
+{
+write( EOL + "**" );
+}
+
+
svn commit: r519329 - in /maven/doxia/trunk/doxia-modules/doxia-module-fml: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/maven/ src/main/java/
Author: jvanzyl Date: Sat Mar 17 07:45:55 2007 New Revision: 519329 URL: http://svn.apache.org/viewvc?view=rev&rev=519329 Log: o creating a separate module for FML Added: maven/doxia/trunk/doxia-modules/doxia-module-fml/ maven/doxia/trunk/doxia-modules/doxia-module-fml/pom.xml (with props) maven/doxia/trunk/doxia-modules/doxia-module-fml/src/ maven/doxia/trunk/doxia-modules/doxia-module-fml/src/main/ maven/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/ maven/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/ maven/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/ maven/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/ maven/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/ maven/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/ maven/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/ maven/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java (with props) maven/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlSiteModule.java (with props) maven/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/model/ maven/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/model/Faq.java (with props) maven/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/model/Faqs.java (with props) maven/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/model/Part.java (with props) maven/doxia/trunk/doxia-modules/doxia-module-fml/src/test/ maven/doxia/trunk/doxia-modules/doxia-module-fml/src/test/java/ maven/doxia/trunk/doxia-modules/doxia-module-fml/src/test/java/org/ maven/doxia/trunk/doxia-modules/doxia-module-fml/src/test/java/org/apache/ maven/doxia/trunk/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/ maven/doxia/trunk/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/ maven/doxia/trunk/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/ maven/doxia/trunk/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/ maven/doxia/trunk/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java (with props) Added: maven/doxia/trunk/doxia-modules/doxia-module-fml/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-fml/pom.xml?view=auto&rev=519329 == --- maven/doxia/trunk/doxia-modules/doxia-module-fml/pom.xml (added) +++ maven/doxia/trunk/doxia-modules/doxia-module-fml/pom.xml Sat Mar 17 07:45:55 2007 @@ -0,0 +1,21 @@ + + +doxia-modules +org.apache.maven.doxia +1.0-alpha-9-SNAPSHOT + + 4.0.0 + org.apache.maven.doxia + doxia-module-fml + doxia-module-fml + 1.0-SNAPSHOT + http://maven.apache.org + + + junit + junit + 3.8.1 + test + + + \ No newline at end of file Propchange: maven/doxia/trunk/doxia-modules/doxia-module-fml/pom.xml -- svn:eol-style = native Propchange: maven/doxia/trunk/doxia-modules/doxia-module-fml/pom.xml -- svn:keywords = "Author Date Id Revision" Added: maven/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java?view=auto&rev=519329 == --- maven/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java (added) +++ maven/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java Sat Mar 17 07:45:55 2007 @@ -0,0 +1,509 @@ +package org.apache.maven.doxia.module.fml; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the Licens
svn commit: r519330 - in /maven/doxia/trunk/doxia-modules/doxia-module-latex: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/maven/ src/main/jav
Author: jvanzyl Date: Sat Mar 17 07:46:28 2007 New Revision: 519330 URL: http://svn.apache.org/viewvc?view=rev&rev=519330 Log: o separate module for latex Added: maven/doxia/trunk/doxia-modules/doxia-module-latex/ maven/doxia/trunk/doxia-modules/doxia-module-latex/pom.xml (with props) maven/doxia/trunk/doxia-modules/doxia-module-latex/src/ maven/doxia/trunk/doxia-modules/doxia-module-latex/src/main/ maven/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/ maven/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/ maven/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/ maven/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/ maven/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/ maven/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/ maven/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/ maven/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java (with props) maven/doxia/trunk/doxia-modules/doxia-module-latex/src/main/resources/ maven/doxia/trunk/doxia-modules/doxia-module-latex/src/main/resources/org/ maven/doxia/trunk/doxia-modules/doxia-module-latex/src/main/resources/org/apache/ maven/doxia/trunk/doxia-modules/doxia-module-latex/src/main/resources/org/apache/maven/ maven/doxia/trunk/doxia-modules/doxia-module-latex/src/main/resources/org/apache/maven/doxia/ maven/doxia/trunk/doxia-modules/doxia-module-latex/src/main/resources/org/apache/maven/doxia/module/ maven/doxia/trunk/doxia-modules/doxia-module-latex/src/main/resources/org/apache/maven/doxia/module/latex/ maven/doxia/trunk/doxia-modules/doxia-module-latex/src/main/resources/org/apache/maven/doxia/module/latex/default_preamble.tex maven/doxia/trunk/doxia-modules/doxia-module-latex/src/main/resources/org/apache/maven/doxia/module/latex/default_sink_commands.tex maven/doxia/trunk/doxia-modules/doxia-module-latex/src/test/ maven/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/ maven/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/ maven/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/ maven/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/ maven/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/ maven/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/ maven/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/ maven/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java (with props) Added: maven/doxia/trunk/doxia-modules/doxia-module-latex/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-latex/pom.xml?view=auto&rev=519330 == --- maven/doxia/trunk/doxia-modules/doxia-module-latex/pom.xml (added) +++ maven/doxia/trunk/doxia-modules/doxia-module-latex/pom.xml Sat Mar 17 07:46:28 2007 @@ -0,0 +1,21 @@ + + +doxia-modules +org.apache.maven.doxia +1.0-alpha-9-SNAPSHOT + + 4.0.0 + org.apache.maven.doxia + doxia-module-latex + doxia-module-latex + 1.0-SNAPSHOT + http://maven.apache.org + + + junit + junit + 3.8.1 + test + + + \ No newline at end of file Propchange: maven/doxia/trunk/doxia-modules/doxia-module-latex/pom.xml -- svn:eol-style = native Propchange: maven/doxia/trunk/doxia-modules/doxia-module-latex/pom.xml -- svn:keywords = "Author Date Id Revision" Added: maven/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java?view=auto&rev=519330 == --- maven/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java (added) +++ maven/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java Sat Mar 17 07:46:28 2007 @@ -0,0 +1,822 @@ +package org.apache.maven.doxia.module.latex; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses thi
svn commit: r519331 [4/4] - in /maven/doxia/trunk/doxia-modules/doxia-module-rtf: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/maven/ src/main
Added:
maven/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/WMFWriter.java
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/WMFWriter.java?view=auto&rev=519331
==
---
maven/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/WMFWriter.java
(added)
+++
maven/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/WMFWriter.java
Sat Mar 17 07:47:59 2007
@@ -0,0 +1,553 @@
+package org.apache.maven.doxia.module.rtf;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.BufferedOutputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.Writer;
+import java.util.Vector;
+
+/**
+ * A Windows MetaFile writer.
+ */
+public class WMFWriter
+{
+
+/*
+ * See the libwmf library documentation
+ * (http://www.wvware.com/wmf_doc_index.html)
+ * for a description of WMF format.
+ */
+
+private static Record trailer = new Record( 0, null );
+
+/*
+ * standard header fields
+ */
+private short fileType;
+
+private short headerSize;
+
+private short version;
+
+private int fileSize;
+
+private short numOfObjects;
+
+private int maxRecordSize;
+
+private short numOfParams;
+
+private Vector records;
+
+public WMFWriter()
+{
+fileType = 2;
+headerSize = 9;
+version = 0x0300;
+fileSize = headerSize + trailer.size();
+numOfObjects = 0;
+maxRecordSize = trailer.size();
+numOfParams = 0;
+
+records = new Vector();
+}
+
+public void add( Record record )
+{
+records.addElement( record );
+
+int size = record.size();
+fileSize += size;
+if ( size > maxRecordSize )
+{
+maxRecordSize = size;
+}
+}
+
+public int size()
+{
+return fileSize;
+}
+
+public void write( String fileName )
+throws IOException
+{
+BufferedOutputStream out = new BufferedOutputStream( new
FileOutputStream( fileName ) );
+write( out );
+out.flush();
+out.close();
+}
+
+public void write( OutputStream out )
+throws IOException
+{
+write16( fileType, out );
+write16( headerSize, out );
+write16( version, out );
+write32( fileSize, out );
+write16( numOfObjects, out );
+write32( maxRecordSize, out );
+write16( numOfParams, out );
+
+for ( int i = 0, n = records.size(); i < n; ++i )
+{
+Record record = (Record) records.elementAt( i );
+record.write( out );
+}
+
+trailer.write( out );
+}
+
+/**
+ * Writes a 16-bit integer in little-endian format.
+ */
+public static void write16( int word, OutputStream out )
+throws IOException
+{
+out.write( word );
+out.write( word >> 8 );
+}
+
+/**
+ * Writes a 32-bit integer in little-endian format.
+ */
+public static void write32( int dword, OutputStream out )
+throws IOException
+{
+out.write( dword );
+out.write( dword >> 8 );
+out.write( dword >> 16 );
+out.write( dword >> 24 );
+}
+
+public void print( Writer out )
+throws IOException
+{
+print16( fileType, out );
+print16( headerSize, out );
+print16( version, out );
+print32( fileSize, out );
+print16( numOfObjects, out );
+print32( maxRecordSize, out );
+print16( numOfParams, out );
+out.write( System.getProperty( "line.separator" ) );
+
+for ( int i = 0, n = records.size(); i < n; ++i )
+{
+Record record = (Record) records.elementAt( i );
+record.print( out );
+}
+
+trailer.print( out );
+}
+
+public static void print16( int word, Writer out )
+throws IOException
+{
+byte[]
svn commit: r519332 - in /maven/doxia/trunk/doxia-modules/doxia-module-xdoc: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/maven/ src/main/java
Author: jvanzyl Date: Sat Mar 17 07:48:17 2007 New Revision: 519332 URL: http://svn.apache.org/viewvc?view=rev&rev=519332 Log: o separate xdoc module Added: maven/doxia/trunk/doxia-modules/doxia-module-xdoc/ maven/doxia/trunk/doxia-modules/doxia-module-xdoc/pom.xml (with props) maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/ maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/ maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/ maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/ maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/ maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/ maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/ maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/ maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/ maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java (with props) maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java (with props) maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSiteModule.java (with props) maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/ maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/ maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/ maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/ maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/ maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/ maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/ maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/ maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java (with props) maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java (with props) Added: maven/doxia/trunk/doxia-modules/doxia-module-xdoc/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-xdoc/pom.xml?view=auto&rev=519332 == --- maven/doxia/trunk/doxia-modules/doxia-module-xdoc/pom.xml (added) +++ maven/doxia/trunk/doxia-modules/doxia-module-xdoc/pom.xml Sat Mar 17 07:48:17 2007 @@ -0,0 +1,21 @@ + + +doxia-modules +org.apache.maven.doxia +1.0-alpha-9-SNAPSHOT + + 4.0.0 + org.apache.maven.doxia + doxia-module-xdoc + doxia-module-xdoc + 1.0-SNAPSHOT + http://maven.apache.org + + + junit + junit + 3.8.1 + test + + + \ No newline at end of file Propchange: maven/doxia/trunk/doxia-modules/doxia-module-xdoc/pom.xml -- svn:eol-style = native Propchange: maven/doxia/trunk/doxia-modules/doxia-module-xdoc/pom.xml -- svn:keywords = "Author Date Id Revision" Added: maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java?view=auto&rev=519332 == --- maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java (added) +++ maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java Sat Mar 17 07:48:17 2007 @@ -0,0 +1,366 @@ +package org.apache.maven.doxia.module.xdoc; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitatio
svn commit: r519334 - /maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/apt/
Author: jvanzyl Date: Sat Mar 17 07:50:22 2007 New Revision: 519334 URL: http://svn.apache.org/viewvc?view=rev&rev=519334 Log: o move to its own module Removed: maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/apt/
svn commit: r519335 - /maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/latex/
Author: jvanzyl Date: Sat Mar 17 07:50:36 2007 New Revision: 519335 URL: http://svn.apache.org/viewvc?view=rev&rev=519335 Log: o move to its own module Removed: maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/latex/
svn commit: r519336 - /maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/fml/
Author: jvanzyl Date: Sat Mar 17 07:50:44 2007 New Revision: 519336 URL: http://svn.apache.org/viewvc?view=rev&rev=519336 Log: o move to its own module Removed: maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/fml/
svn commit: r519337 - /maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/rtf/
Author: jvanzyl Date: Sat Mar 17 07:50:55 2007 New Revision: 519337 URL: http://svn.apache.org/viewvc?view=rev&rev=519337 Log: o move to its own module Removed: maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/rtf/
svn commit: r519338 - /maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/xdoc/
Author: jvanzyl Date: Sat Mar 17 07:51:19 2007 New Revision: 519338 URL: http://svn.apache.org/viewvc?view=rev&rev=519338 Log: o move to its own module Removed: maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/xdoc/
svn commit: r519340 - /maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/xhtml/
Author: jvanzyl Date: Sat Mar 17 07:53:03 2007 New Revision: 519340 URL: http://svn.apache.org/viewvc?view=rev&rev=519340 Log: o move to its own module Removed: maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/xhtml/
svn commit: r519342 - /maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/apt/
Author: jvanzyl Date: Sat Mar 17 07:54:08 2007 New Revision: 519342 URL: http://svn.apache.org/viewvc?view=rev&rev=519342 Log: o move to its own module Removed: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/apt/
svn commit: r519343 - /maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/fml/
Author: jvanzyl Date: Sat Mar 17 07:54:16 2007 New Revision: 519343 URL: http://svn.apache.org/viewvc?view=rev&rev=519343 Log: o move to its own module Removed: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/fml/
svn commit: r519344 - /maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/latex/
Author: jvanzyl Date: Sat Mar 17 07:54:26 2007 New Revision: 519344 URL: http://svn.apache.org/viewvc?view=rev&rev=519344 Log: o move to its own module Removed: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/latex/
svn commit: r519345 - /maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/rtf/
Author: jvanzyl Date: Sat Mar 17 07:54:36 2007 New Revision: 519345 URL: http://svn.apache.org/viewvc?view=rev&rev=519345 Log: o move to its own module Removed: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/rtf/
svn commit: r519346 - /maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xdoc/
Author: jvanzyl Date: Sat Mar 17 07:54:48 2007 New Revision: 519346 URL: http://svn.apache.org/viewvc?view=rev&rev=519346 Log: o move to its own module Removed: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xdoc/
svn commit: r519347 - /maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/
Author: jvanzyl Date: Sat Mar 17 07:54:57 2007 New Revision: 519347 URL: http://svn.apache.org/viewvc?view=rev&rev=519347 Log: o move to its own module Removed: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/
svn commit: r519348 - /maven/doxia/trunk/doxia-core/src/test/site-generated/
Author: jvanzyl Date: Sat Mar 17 07:57:20 2007 New Revision: 519348 URL: http://svn.apache.org/viewvc?view=rev&rev=519348 Log: o not used Removed: maven/doxia/trunk/doxia-core/src/test/site-generated/
svn commit: r519349 - /maven/doxia/trunk/doxia-core/src/test/resources/test/
Author: jvanzyl Date: Sat Mar 17 08:03:13 2007 New Revision: 519349 URL: http://svn.apache.org/viewvc?view=rev&rev=519349 Log: o not used, all the source documents are in the site/ Removed: maven/doxia/trunk/doxia-core/src/test/resources/test/
svn commit: r519544 - in /maven/doxia/trunk/doxia-core: ./ src/main/java/org/apache/maven/doxia/ src/main/java/org/apache/maven/doxia/index/ src/main/java/org/apache/maven/doxia/macro/ src/main/java/o
Author: jvanzyl Date: Sat Mar 17 22:05:04 2007 New Revision: 519544 URL: http://svn.apache.org/viewvc?view=rev&rev=519544 Log: o modules and tests all decoupled Added: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/ByLineReaderSource.java (contents, props changed) - copied, changed from r519326, maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/common/ByLineReaderSource.java maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/ByLineSource.java (contents, props changed) - copied, changed from r519326, maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/common/ByLineSource.java maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java (contents, props changed) - copied, changed from r519326, maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/HtmlTools.java maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/macro/ maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/macro/MacroManagerTest.java (with props) Removed: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/HtmlTools.java maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/common/ByLineReaderSource.java maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/common/ByLineSource.java maven/doxia/trunk/doxia-core/src/main/resources/org/ maven/doxia/trunk/doxia-core/src/samples/ maven/doxia/trunk/doxia-core/src/test/resources/codehaus.dst maven/doxia/trunk/doxia-core/src/test/resources/convert/ maven/doxia/trunk/doxia-core/src/test/resources/examples-full.apt maven/doxia/trunk/doxia-core/src/test/resources/examples.apt maven/doxia/trunk/doxia-core/src/test/resources/examples.xml maven/doxia/trunk/doxia-core/src/test/resources/parse/ maven/doxia/trunk/doxia-core/src/test/site/ Modified: maven/doxia/trunk/doxia-core/pom.xml maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/DefaultDoxia.java maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/Doxia.java maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/index/IndexingSink.java maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/EchoMacro.java maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/manager/DefaultMacroManager.java maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/toc/TocMacro.java maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/manager/DefaultParserManager.java maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/site/module/manager/DefaultSiteModuleManager.java maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/StringUtil.java maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/HtmlToolsTest.java maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTestCase.java Modified: maven/doxia/trunk/doxia-core/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-core/pom.xml?view=diff&rev=519544&r1=519543&r2=519544 == --- maven/doxia/trunk/doxia-core/pom.xml (original) +++ maven/doxia/trunk/doxia-core/pom.xml Sat Mar 17 22:05:04 2007 @@ -59,18 +59,20 @@ org.apache.maven.doxia doxia-sink-api - 1.0-alpha-8 org.codehaus.plexus plexus-utils - 1.0.4 org.codehaus.plexus plexus-container-default - 1.0-alpha-8 - runtime + Modified: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/DefaultDoxia.java URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/DefaultDoxia.java?view=diff&rev=519544&r1=519543&r2=519544 == --- maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/DefaultDoxia.java (original) +++ maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/DefaultDoxia.java Sat Mar 17 22:05:04 2007 @@ -28,9 +28,9 @@ import java.io.Reader; /** - * @plexus.component role="org.apache.maven.doxia.Doxia" + * @plexus.component * - * @author mailto:[EMAIL PROTECTED]">Jason van Zyl + * @author Jason van Zyl * @version $Id:DefaultDoxia.java 348605 2005-11-24 12:02:44 +1100 (Thu, 24 Nov 2005) brett $ */ public class DefaultDoxia Modified: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/Doxia.java URL: http://svn.apache.org/viewvc/maven/
svn commit: r519545 - in /maven/doxia/trunk/doxia-modules/doxia-module-apt: ./ src/main/java/org/apache/maven/doxia/module/apt/ src/main/resources/ src/main/resources/META-INF/ src/main/resources/META
Author: jvanzyl
Date: Sat Mar 17 22:07:36 2007
New Revision: 519545
URL: http://svn.apache.org/viewvc?view=rev&rev=519545
Log:
decoupling module
Added:
maven/doxia/trunk/doxia-modules/doxia-module-apt/src/main/resources/
maven/doxia/trunk/doxia-modules/doxia-module-apt/src/main/resources/META-INF/
maven/doxia/trunk/doxia-modules/doxia-module-apt/src/main/resources/META-INF/plexus/
maven/doxia/trunk/doxia-modules/doxia-module-apt/src/main/resources/META-INF/plexus/components.xml
(with props)
maven/doxia/trunk/doxia-modules/doxia-module-apt/src/test/resources/
maven/doxia/trunk/doxia-modules/doxia-module-apt/src/test/resources/linebreak.apt
(with props)
maven/doxia/trunk/doxia-modules/doxia-module-apt/src/test/resources/macro.apt
(with props)
maven/doxia/trunk/doxia-modules/doxia-module-apt/src/test/resources/test/
maven/doxia/trunk/doxia-modules/doxia-module-apt/src/test/resources/test.apt
(with props)
maven/doxia/trunk/doxia-modules/doxia-module-apt/src/test/resources/test/linebreak.apt
(with props)
maven/doxia/trunk/doxia-modules/doxia-module-apt/src/test/resources/test/macro.apt
(with props)
maven/doxia/trunk/doxia-modules/doxia-module-apt/src/test/resources/test/test.apt
(with props)
maven/doxia/trunk/doxia-modules/doxia-module-apt/src/test/resources/test/toc.apt
(with props)
maven/doxia/trunk/doxia-modules/doxia-module-apt/src/test/resources/toc.apt
(with props)
Modified:
maven/doxia/trunk/doxia-modules/doxia-module-apt/pom.xml
maven/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
maven/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java
maven/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSiteModule.java
maven/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptParserTest.java
maven/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptSinkTest.java
Modified: maven/doxia/trunk/doxia-modules/doxia-module-apt/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-apt/pom.xml?view=diff&rev=519545&r1=519544&r2=519545
==
--- maven/doxia/trunk/doxia-modules/doxia-module-apt/pom.xml (original)
+++ maven/doxia/trunk/doxia-modules/doxia-module-apt/pom.xml Sat Mar 17
22:07:36 2007
@@ -5,17 +5,5 @@
1.0-alpha-9-SNAPSHOT
4.0.0
- org.apache.maven.doxia
doxia-module-apt
- doxia-module-apt
- 1.0-SNAPSHOT
- http://maven.apache.org
-
-
- junit
- junit
- 3.8.1
- test
-
-
-
\ No newline at end of file
+
Modified:
maven/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java?view=diff&rev=519545&r1=519544&r2=519545
==
---
maven/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
(original)
+++
maven/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
Sat Mar 17 22:07:36 2007
@@ -22,6 +22,7 @@
import org.apache.maven.doxia.macro.MacroExecutionException;
import org.apache.maven.doxia.macro.MacroRequest;
import org.apache.maven.doxia.macro.manager.MacroNotFoundException;
+import org.apache.maven.doxia.macro.manager.MacroManager;
import org.apache.maven.doxia.parser.AbstractParser;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.SinkAdapter;
@@ -36,9 +37,7 @@
import java.util.Map;
import java.util.StringTokenizer;
-/**
- * @plexus.component role-hint="apt"
- */
+/** @plexus.component role="org.apache.maven.doxia.parser.Parser"
role-hint="apt" */
public class AptParser
extends AbstractParser
{
@@ -108,7 +107,8 @@
// ---
-public void parse( Reader source, Sink sink )
+public void parse( Reader source,
+ Sink sink )
throws AptParseException
{
try
@@ -618,13 +618,13 @@
{
switch ( line.charAt( i ) )
{
-case ' ':
+case' ':
++indent;
break;
-case '\t':
+case'\t':
indent += 8;
break;
-case '~':
+case'~':
if ( charAt( line, length, i + 1 ) == '~' )
{
svn commit: r519546 - in /maven/doxia/trunk/doxia-modules/doxia-module-confluence: ./ src/main/java/org/apache/maven/doxia/module/confluence/ src/main/java/org/apache/maven/doxia/module/confluence/par
Author: jvanzyl
Date: Sat Mar 17 22:07:43 2007
New Revision: 519546
URL: http://svn.apache.org/viewvc?view=rev&rev=519546
Log:
decoupling module
Modified:
maven/doxia/trunk/doxia-modules/doxia-module-confluence/pom.xml
maven/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceParser.java
maven/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/BlockParser.java
maven/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/HorizontalRuleBlockParser.java
maven/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ParagraphBlockParser.java
maven/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/SectionBlockParser.java
maven/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/VerbatimBlockParser.java
maven/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListBlockParser.java
maven/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java
Modified: maven/doxia/trunk/doxia-modules/doxia-module-confluence/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-confluence/pom.xml?view=diff&rev=519546&r1=519545&r2=519546
==
--- maven/doxia/trunk/doxia-modules/doxia-module-confluence/pom.xml (original)
+++ maven/doxia/trunk/doxia-modules/doxia-module-confluence/pom.xml Sat Mar 17
22:07:43 2007
@@ -26,7 +26,6 @@
doxia-module-confluence
Doxia Confluence Module
- 1.0-alpha-9-SNAPSHOT
Juan F. Codagnone
Modified:
maven/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceParser.java
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceParser.java?view=diff&rev=519546&r1=519545&r2=519546
==
---
maven/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceParser.java
(original)
+++
maven/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceParser.java
Sat Mar 17 22:07:43 2007
@@ -19,8 +19,8 @@
* under the License.
*/
-import org.apache.maven.doxia.module.common.ByLineReaderSource;
-import org.apache.maven.doxia.module.common.ByLineSource;
+import org.apache.maven.doxia.util.ByLineReaderSource;
+import org.apache.maven.doxia.util.ByLineSource;
import org.apache.maven.doxia.module.confluence.parser.Block;
import org.apache.maven.doxia.module.confluence.parser.BlockParser;
import org.apache.maven.doxia.module.confluence.parser.SectionBlockParser;
@@ -38,10 +38,7 @@
import java.util.Iterator;
import java.util.List;
-/**
- * @plexus.component role="org.apache.maven.doxia.parser.Parser"
- * role-hint="confluence"
- */
+/** @plexus.component role-hint="confluence" */
public class ConfluenceParser
extends AbstractParser
{
@@ -56,15 +53,8 @@
BlockParser listParser = new ListBlockParser();
BlockParser tableParser = new TableBlockParser();
-parsers = new BlockParser[]
-{
-headingParser,
-verbatimParser,
-horizontalRuleParser,
-listParser,
-tableParser,
-paragraphParser
-};
+parsers = new BlockParser[]{headingParser, verbatimParser,
horizontalRuleParser, listParser, tableParser,
+paragraphParser};
}
//TODO: (empty line) Produces a new paragraph
@@ -119,7 +109,8 @@
return blocks;
}
-public synchronized void parse( Reader reader, Sink sink )
+public synchronized void parse( Reader reader,
+Sink sink )
throws ParseException
{
List blocks;
@@ -130,11 +121,11 @@
{
blocks = parse( source );
}
-catch ( ParseException e )
+catch ( ParseException e )
{
throw e;
}
-catch ( Exception e )
+catch ( Exception e )
{
throw new ParseException( e, source.getName(),
source.getLineNumber() );
}
Modified:
maven/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/BlockParser.java
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/dox
svn commit: r519547 - in /maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple: pom.xml src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java src/test/java/org/apache/maven/doxia
Author: jvanzyl
Date: Sat Mar 17 22:07:48 2007
New Revision: 519547
URL: http://svn.apache.org/viewvc?view=rev&rev=519547
Log:
decoupling module
Modified:
maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/pom.xml
maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java
maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java
Modified: maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/pom.xml?view=diff&rev=519547&r1=519546&r2=519547
==
--- maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/pom.xml
(original)
+++ maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/pom.xml Sat Mar
17 22:07:48 2007
@@ -26,5 +26,4 @@
doxia-module-docbook-simple
Doxia Docbook Simple Module
- 1.0-alpha-9-SNAPSHOT
Modified:
maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java?view=diff&rev=519547&r1=519546&r2=519547
==
---
maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java
(original)
+++
maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java
Sat Mar 17 22:07:48 2007
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.apache.maven.doxia.module.apt.AptParser;
+import org.apache.maven.doxia.parser.Parser;
import org.apache.maven.doxia.sink.SinkAdapter;
import org.apache.maven.doxia.sink.StructureSink;
import org.apache.maven.doxia.util.FileUtil;
@@ -727,13 +727,13 @@
String justif;
switch ( justification[i] )
{
-case AptParser.JUSTIFY_LEFT:
+case Parser.JUSTIFY_LEFT:
justif = "left";
break;
-case AptParser.JUSTIFY_RIGHT:
+case Parser.JUSTIFY_RIGHT:
justif = "right";
break;
-case AptParser.JUSTIFY_CENTER:
+case Parser.JUSTIFY_CENTER:
default:
justif = "center";
break;
Modified:
maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java?view=diff&rev=519547&r1=519546&r2=519547
==
---
maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java
(original)
+++
maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java
Sat Mar 17 22:07:48 2007
@@ -21,6 +21,11 @@
import org.apache.maven.doxia.sink.AbstractSinkTestCase;
import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.parser.Parser;
+
+import java.io.Reader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
/**
* @author mailto:[EMAIL PROTECTED]">Jason van Zyl
@@ -34,9 +39,24 @@
return "docbook";
}
+protected Parser createParser()
+{
+return new DocBookParser();
+}
+
protected Sink createSink()
throws Exception
{
return new DocBookSink( getTestWriter() );
+}
+
+protected Reader getTestReader()
+throws Exception
+{
+InputStream is =
Thread.currentThread().getContextClassLoader().getResourceAsStream( "guide.xml"
);
+
+InputStreamReader reader = new InputStreamReader( is );
+
+return reader;
}
}
svn commit: r519548 - in /maven/doxia/trunk/doxia-modules/doxia-module-fml: ./ src/main/java/org/apache/maven/doxia/module/fml/ src/test/java/org/apache/maven/doxia/module/fml/ src/test/resources/
Author: jvanzyl
Date: Sat Mar 17 22:07:54 2007
New Revision: 519548
URL: http://svn.apache.org/viewvc?view=rev&rev=519548
Log:
decoupling module
Added:
maven/doxia/trunk/doxia-modules/doxia-module-fml/src/test/resources/
maven/doxia/trunk/doxia-modules/doxia-module-fml/src/test/resources/faq.fml
(with props)
Modified:
maven/doxia/trunk/doxia-modules/doxia-module-fml/pom.xml
maven/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java
maven/doxia/trunk/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java
Modified: maven/doxia/trunk/doxia-modules/doxia-module-fml/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-fml/pom.xml?view=diff&rev=519548&r1=519547&r2=519548
==
--- maven/doxia/trunk/doxia-modules/doxia-module-fml/pom.xml (original)
+++ maven/doxia/trunk/doxia-modules/doxia-module-fml/pom.xml Sat Mar 17
22:07:54 2007
@@ -5,17 +5,5 @@
1.0-alpha-9-SNAPSHOT
4.0.0
- org.apache.maven.doxia
doxia-module-fml
- doxia-module-fml
- 1.0-SNAPSHOT
- http://maven.apache.org
-
-
- junit
- junit
- 3.8.1
- test
-
-
-
\ No newline at end of file
+
Modified:
maven/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java?view=diff&rev=519548&r1=519547&r2=519548
==
---
maven/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java
(original)
+++
maven/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java
Sat Mar 17 22:07:54 2007
@@ -23,7 +23,7 @@
import java.io.StringReader;
import java.util.Iterator;
-import org.apache.maven.doxia.module.HtmlTools;
+import org.apache.maven.doxia.util.HtmlTools;
import org.apache.maven.doxia.module.fml.model.Faq;
import org.apache.maven.doxia.module.fml.model.Faqs;
import org.apache.maven.doxia.module.fml.model.Part;
Modified:
maven/doxia/trunk/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java?view=diff&rev=519548&r1=519547&r2=519548
==
---
maven/doxia/trunk/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java
(original)
+++
maven/doxia/trunk/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java
Sat Mar 17 22:07:54 2007
@@ -37,6 +37,6 @@
protected String getDocument()
{
-return "src/test/site/fml/faq.fml";
+return "src/test/resources/faq.fml";
}
}
Added:
maven/doxia/trunk/doxia-modules/doxia-module-fml/src/test/resources/faq.fml
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-fml/src/test/resources/faq.fml?view=auto&rev=519548
==
--- maven/doxia/trunk/doxia-modules/doxia-module-fml/src/test/resources/faq.fml
(added)
+++ maven/doxia/trunk/doxia-modules/doxia-module-fml/src/test/resources/faq.fml
Sat Mar 17 22:07:54 2007
@@ -0,0 +1,765 @@
+
+
+
+
+
+
+
+General
+
+
+ What does Maven mean?
+ A maven (yi.=meyvn) is an experienced or knowledgeable
person, such as an expert or freak.
+
+
+
+
+Where Can I Get Help?
+
+
+ Where do I get help on Maven?
+
+
+ For help getting started, or basic use of Maven, refer to the
documentation
+ that can be found from the left navigation of this site.
+
+
+ If these documents, and the other questions in this FAQ don't help
you with your problem, the
+ Maven User List is a good source for
help.
+ Lots of problems have already been discussed there, so please search
the mailing list archive
+ before posting a question or a new idea.
+ Most of the Maven developers are subscribed to the Maven User List,
so there is no need to post
+ to the Maven Developers list unless you want to discuss making a
change to Maven itself.
+
+
+ Maven developers meet via IRC: irc.codehaus.org,
+ channel #maven.
+ But please don't ask for solutions to Maven problems there, as
+ Maven user problems should be discussed at the mailing list
+ for several good reasons (e.g. mail archive, more subscribers) and
svn commit: r519549 - in /maven/doxia/trunk/doxia-modules/doxia-module-itext: pom.xml src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java src/test/java/org/apache/maven/doxia/module/itext
Author: jvanzyl
Date: Sat Mar 17 22:08:00 2007
New Revision: 519549
URL: http://svn.apache.org/viewvc?view=rev&rev=519549
Log:
decoupling module
Modified:
maven/doxia/trunk/doxia-modules/doxia-module-itext/pom.xml
maven/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
maven/doxia/trunk/doxia-modules/doxia-module-itext/src/test/java/org/apache/maven/doxia/module/itext/ITextSinkTestCase.java
Modified: maven/doxia/trunk/doxia-modules/doxia-module-itext/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-itext/pom.xml?view=diff&rev=519549&r1=519548&r2=519549
==
--- maven/doxia/trunk/doxia-modules/doxia-module-itext/pom.xml (original)
+++ maven/doxia/trunk/doxia-modules/doxia-module-itext/pom.xml Sat Mar 17
22:08:00 2007
@@ -28,7 +28,6 @@
4.0.0
doxia-module-itext
Doxia iText Module
- 1.0-SNAPSHOT
vsiveton
@@ -51,9 +50,20 @@
xpp3
xpp3
1.1.3.4-RC3
-
+
+
+ org.apache.maven.doxia
+ doxia-module-apt
+ ${projectVersion}
+ test
+
+
+ org.apache.maven.doxia
+ doxia-module-xdoc
+ ${projectVersion}
+ test
+
-
Modified:
maven/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java?view=diff&rev=519549&r1=519548&r2=519549
==
---
maven/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
(original)
+++
maven/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
Sat Mar 17 22:08:00 2007
@@ -22,7 +22,7 @@
import com.lowagie.text.BadElementException;
import com.lowagie.text.ElementTags;
import com.lowagie.text.Image;
-import org.apache.maven.doxia.module.HtmlTools;
+import org.apache.maven.doxia.util.HtmlTools;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.SinkAdapter;
import org.codehaus.plexus.util.IOUtil;
Modified:
maven/doxia/trunk/doxia-modules/doxia-module-itext/src/test/java/org/apache/maven/doxia/module/itext/ITextSinkTestCase.java
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-itext/src/test/java/org/apache/maven/doxia/module/itext/ITextSinkTestCase.java?view=diff&rev=519549&r1=519548&r2=519549
==
---
maven/doxia/trunk/doxia-modules/doxia-module-itext/src/test/java/org/apache/maven/doxia/module/itext/ITextSinkTestCase.java
(original)
+++
maven/doxia/trunk/doxia-modules/doxia-module-itext/src/test/java/org/apache/maven/doxia/module/itext/ITextSinkTestCase.java
Sat Mar 17 22:08:00 2007
@@ -118,6 +118,8 @@
new FileOutputStream( getGeneratedFile(
"test_itext_apt", ".pdf" ) ) );
}
+// DOXIA-
+
/**
* Generate a pdf and a rtf from an apt file
*
@@ -129,15 +131,13 @@
Sink sink = createSink( "test_apt", ".xml" );
AptParser parser = new AptParser();
+
parser.parse( getAptReader( "apt/test.apt" ), sink );
sink.close();
ITextUtil.writePdf( new FileInputStream( getGeneratedFile( "test_apt",
".xml" ) ),
new FileOutputStream( getGeneratedFile(
"test_apt", ".pdf" ) ) );
-
-//ITextUtil.writeRtf( new FileInputStream( getGeneratedFile(
"test_apt", ".xml" ) ),
- // new FileOutputStream( getGeneratedFile(
"test_apt", ".rtf" ) ) );
}
/**
@@ -151,6 +151,7 @@
Sink sink = createSink( "guide-ide-netbeans_apt", ".xml" );
AptParser parser = new AptParser();
+
parser.parse( getAptReader( "apt/guide-ide-netbeans.apt" ), sink );
sink.close();
@@ -173,6 +174,7 @@
Sink sink = createSink( "test_xdoc", ".xml" );
XdocParser parser = new XdocParser();
+
parser.parse( getXdocReader( "xdoc/test.xml" ), sink );
sink.close();
svn commit: r519550 - in /maven/doxia/trunk/doxia-modules/doxia-module-latex: ./ src/main/java/org/apache/maven/doxia/module/latex/ src/test/java/org/apache/maven/doxia/module/latex/ src/test/resource
Author: jvanzyl
Date: Sat Mar 17 22:08:07 2007
New Revision: 519550
URL: http://svn.apache.org/viewvc?view=rev&rev=519550
Log:
decoupling module
Added:
maven/doxia/trunk/doxia-modules/doxia-module-latex/src/test/resources/
maven/doxia/trunk/doxia-modules/doxia-module-latex/src/test/resources/test.apt
(with props)
Modified:
maven/doxia/trunk/doxia-modules/doxia-module-latex/pom.xml
maven/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
maven/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java
Modified: maven/doxia/trunk/doxia-modules/doxia-module-latex/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-latex/pom.xml?view=diff&rev=519550&r1=519549&r2=519550
==
--- maven/doxia/trunk/doxia-modules/doxia-module-latex/pom.xml (original)
+++ maven/doxia/trunk/doxia-modules/doxia-module-latex/pom.xml Sat Mar 17
22:08:07 2007
@@ -5,17 +5,13 @@
1.0-alpha-9-SNAPSHOT
4.0.0
- org.apache.maven.doxia
doxia-module-latex
- doxia-module-latex
- 1.0-SNAPSHOT
- http://maven.apache.org
- junit
- junit
- 3.8.1
+ org.apache.maven.doxia
+ doxia-module-apt
+ ${projectVersion}
test
-
-
\ No newline at end of file
+
+
Modified:
maven/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java?view=diff&rev=519550&r1=519549&r2=519550
==
---
maven/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
(original)
+++
maven/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
Sat Mar 17 22:08:07 2007
@@ -19,15 +19,15 @@
* under the License.
*/
-import org.apache.maven.doxia.module.apt.AptParser;
+import org.apache.maven.doxia.parser.Parser;
import org.apache.maven.doxia.sink.SinkAdapter;
import org.apache.maven.doxia.util.LineBreaker;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
-import java.io.Writer;
import java.io.IOException;
import java.io.InputStream;
+import java.io.Writer;
public class LatexSink
extends SinkAdapter
@@ -395,13 +395,13 @@
}
switch ( justification[i] )
{
-case AptParser.JUSTIFY_CENTER:
+case Parser.JUSTIFY_CENTER:
justif.append( 'c' );
break;
-case AptParser.JUSTIFY_LEFT:
+case Parser.JUSTIFY_LEFT:
justif.append( 'l' );
break;
-case AptParser.JUSTIFY_RIGHT:
+case Parser.JUSTIFY_RIGHT:
justif.append( 'r' );
break;
}
@@ -587,13 +587,13 @@
char justif;
switch ( cellJustif[cellCount] )
{
-case AptParser.JUSTIFY_LEFT:
+case Parser.JUSTIFY_LEFT:
justif = 'l';
break;
-case AptParser.JUSTIFY_RIGHT:
+case Parser.JUSTIFY_RIGHT:
justif = 'r';
break;
-case AptParser.JUSTIFY_CENTER:
+case Parser.JUSTIFY_CENTER:
default:
justif = 'c';
break;
Modified:
maven/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java?view=diff&rev=519550&r1=519549&r2=519550
==
---
maven/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java
(original)
+++
maven/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java
Sat Mar 17 22:08:07 2007
@@ -20,8 +20,14 @@
*/
import org.apache.maven.doxia.module.latex.LatexSink;
+import org.apache.maven.doxia.module.apt.AptParser;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.AbstractSinkTestCase;
+import org.apache.maven.doxia.parser.Parser;
+
+import java.io.Reader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
/**
* @author mailto:[EMAIL PROTECTED]">Jason van Zyl
@@ -35,9 +41,24 @@
return "tex";
}
+protected Parser createParser()
+{
+return new AptParse
svn commit: r519551 - in /maven/doxia/trunk/doxia-modules/doxia-module-rtf: ./ src/main/java/org/apache/maven/doxia/module/rtf/ src/test/java/org/apache/maven/doxia/module/rtf/ src/test/resources/
Author: jvanzyl
Date: Sat Mar 17 22:08:13 2007
New Revision: 519551
URL: http://svn.apache.org/viewvc?view=rev&rev=519551
Log:
decoupling module
Added:
maven/doxia/trunk/doxia-modules/doxia-module-rtf/src/test/resources/
maven/doxia/trunk/doxia-modules/doxia-module-rtf/src/test/resources/test.apt
(with props)
Modified:
maven/doxia/trunk/doxia-modules/doxia-module-rtf/pom.xml
maven/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java
maven/doxia/trunk/doxia-modules/doxia-module-rtf/src/test/java/org/apache/maven/doxia/module/rtf/RtfSinkTest.java
Modified: maven/doxia/trunk/doxia-modules/doxia-module-rtf/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-rtf/pom.xml?view=diff&rev=519551&r1=519550&r2=519551
==
--- maven/doxia/trunk/doxia-modules/doxia-module-rtf/pom.xml (original)
+++ maven/doxia/trunk/doxia-modules/doxia-module-rtf/pom.xml Sat Mar 17
22:08:13 2007
@@ -5,17 +5,13 @@
1.0-alpha-9-SNAPSHOT
4.0.0
- org.apache.maven.doxia
doxia-module-rtf
- doxia-module-rtf
- 1.0-SNAPSHOT
- http://maven.apache.org
- junit
- junit
- 3.8.1
+ org.apache.maven.doxia
+ doxia-module-apt
+ ${projectVersion}
test
-
\ No newline at end of file
+
Modified:
maven/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java?view=diff&rev=519551&r1=519550&r2=519551
==
---
maven/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java
(original)
+++
maven/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java
Sat Mar 17 22:08:13 2007
@@ -19,9 +19,9 @@
* under the License.
*/
-import org.apache.maven.doxia.module.apt.AptParser;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.SinkAdapter;
+import org.apache.maven.doxia.parser.Parser;
import java.awt.*;
import java.io.BufferedOutputStream;
@@ -370,7 +370,7 @@
public void title()
{
Paragraph paragraph = new Paragraph( STYLE_BOLD, fontSize + 6 );
-paragraph.justification = AptParser.JUSTIFY_CENTER;
+paragraph.justification = Parser.JUSTIFY_CENTER;
beginParagraph( paragraph );
emptyHeader = false;
}
@@ -383,7 +383,7 @@
public void author()
{
Paragraph paragraph = new Paragraph( STYLE_ROMAN, fontSize + 2 );
-paragraph.justification = AptParser.JUSTIFY_CENTER;
+paragraph.justification = Parser.JUSTIFY_CENTER;
beginParagraph( paragraph );
emptyHeader = false;
}
@@ -396,7 +396,7 @@
public void date()
{
Paragraph paragraph = new Paragraph( STYLE_ROMAN, fontSize );
-paragraph.justification = AptParser.JUSTIFY_CENTER;
+paragraph.justification = Parser.JUSTIFY_CENTER;
beginParagraph( paragraph );
emptyHeader = false;
}
@@ -816,14 +816,14 @@
{
switch ( justification )
{
-case AptParser.JUSTIFY_LEFT:
+case Parser.JUSTIFY_LEFT:
default:
writer.println( "\\ql" );
break;
-case AptParser.JUSTIFY_CENTER:
+case Parser.JUSTIFY_CENTER:
writer.println( "\\qc" );
break;
-case AptParser.JUSTIFY_RIGHT:
+case Parser.JUSTIFY_RIGHT:
writer.println( "\\qr" );
break;
}
@@ -872,7 +872,7 @@
public void tableCaption()
{
Paragraph paragraph = new Paragraph();
-paragraph.justification = AptParser.JUSTIFY_CENTER;
+paragraph.justification = Parser.JUSTIFY_CENTER;
paragraph.spaceBefore /= 2;
beginParagraph( paragraph );
}
@@ -973,7 +973,7 @@
name = buf.toString();
Paragraph paragraph = new Paragraph();
-paragraph.justification = AptParser.JUSTIFY_CENTER;
+paragraph.justification = Parser.JUSTIFY_CENTER;
beginParagraph( paragraph );
try
@@ -1179,7 +1179,7 @@
public void figureCaption()
{
Paragraph paragraph = new Paragraph();
-paragraph.justification = AptParser.JUSTIFY_CENTER;
+paragraph.justification = Parser.JUSTIFY_CENTER;
paragraph.spaceBefore /= 2;
beginParagraph( paragraph );
}
@@ -1531,7 +1531,7 @@
int style = 0;
-int justification = AptParser.JUSTIFY_LEFT;
+int justification = Parser.JUSTIFY_LEFT;
int leftIndent = indentation.get();
@@ -1568,13 +1568,1
svn commit: r519552 - in /maven/doxia/trunk/doxia-modules/doxia-module-twiki: ./ src/main/java/org/apache/maven/doxia/module/twiki/ src/main/java/org/apache/maven/doxia/module/twiki/parser/ src/test/j
Author: jvanzyl Date: Sat Mar 17 22:08:21 2007 New Revision: 519552 URL: http://svn.apache.org/viewvc?view=rev&rev=519552 Log: decoupling module Modified: maven/doxia/trunk/doxia-modules/doxia-module-twiki/pom.xml maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiParser.java maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/BlockParser.java maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/GenericListBlockParser.java maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/HRuleBlockParser.java maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ParagraphBlockParser.java maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/SectionBlockParser.java maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableBlockParser.java maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/common/ByLineReaderSourceTest.java maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/ListTest.java maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/ParagraphTest.java maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/SectionTest.java maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/TableTest.java Modified: maven/doxia/trunk/doxia-modules/doxia-module-twiki/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-twiki/pom.xml?view=diff&rev=519552&r1=519551&r2=519552 == --- maven/doxia/trunk/doxia-modules/doxia-module-twiki/pom.xml (original) +++ maven/doxia/trunk/doxia-modules/doxia-module-twiki/pom.xml Sat Mar 17 22:08:21 2007 @@ -28,8 +28,7 @@ doxia-module-twiki Doxia TWiki Module - 1.0-alpha-9-SNAPSHOT - + Juan F. Codagnone juan *at* zauber dot. com dot. ar Modified: maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiParser.java URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiParser.java?view=diff&rev=519552&r1=519551&r2=519552 == --- maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiParser.java (original) +++ maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiParser.java Sat Mar 17 22:08:21 2007 @@ -19,17 +19,25 @@ * under the License. */ +import org.apache.maven.doxia.module.twiki.parser.Block; +import org.apache.maven.doxia.module.twiki.parser.BlockParser; +import org.apache.maven.doxia.module.twiki.parser.FormatedTextParser; +import org.apache.maven.doxia.module.twiki.parser.GenericListBlockParser; +import org.apache.maven.doxia.module.twiki.parser.HRuleBlockParser; +import org.apache.maven.doxia.module.twiki.parser.ParagraphBlockParser; +import org.apache.maven.doxia.module.twiki.parser.SectionBlockParser; +import org.apache.maven.doxia.module.twiki.parser.TableBlockParser; +import org.apache.maven.doxia.module.twiki.parser.TextParser; +import org.apache.maven.doxia.parser.AbstractParser; +import org.apache.maven.doxia.parser.ParseException; +import org.apache.maven.doxia.sink.Sink; +import org.apache.maven.doxia.util.ByLineReaderSource; +import org.apache.maven.doxia.util.ByLineSource; + import java.io.Reader; import java.util.ArrayList; import java.util.Iterator; import java.util.List; - -import org.apache.maven.doxia.module.common.ByLineReaderSource; -import org.apache.maven.doxia.module.common.ByLineSource; -import org.apache.maven.doxia.module.twiki.parser.*; -import org.apache.maven.doxia.parser.AbstractParser; -import org.apache.maven.doxia.parser.ParseException; -import org.apache.maven.doxia.sink.Sink; /** * Parse the http://twiki.org/cgi-bin/view/TWiki/TextFormattingRules";> Modified: maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/BlockParser.java URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/BlockParser.java?view=diff&rev=519552&r1=519551&r2=519552 == --- maven/doxia/trunk/doxia-
svn commit: r519554 - in /maven/doxia/trunk/doxia-modules/doxia-module-xhtml: ./ src/main/java/org/apache/maven/doxia/module/xhtml/ src/test/java/org/apache/maven/doxia/module/xhtml/ src/test/resource
Author: jvanzyl
Date: Sat Mar 17 22:08:33 2007
New Revision: 519554
URL: http://svn.apache.org/viewvc?view=rev&rev=519554
Log:
decoupling module
Added:
maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/resources/
maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/resources/fun.html
(with props)
Modified:
maven/doxia/trunk/doxia-modules/doxia-module-xhtml/pom.xml
maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlParserTest.java
maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
Modified: maven/doxia/trunk/doxia-modules/doxia-module-xhtml/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-xhtml/pom.xml?view=diff&rev=519554&r1=519553&r2=519554
==
--- maven/doxia/trunk/doxia-modules/doxia-module-xhtml/pom.xml (original)
+++ maven/doxia/trunk/doxia-modules/doxia-module-xhtml/pom.xml Sat Mar 17
22:08:33 2007
@@ -5,17 +5,5 @@
1.0-alpha-9-SNAPSHOT
4.0.0
- org.apache.maven.doxia
doxia-module-xhtml
- doxia-module-xhtml
- 1.0-SNAPSHOT
- http://maven.apache.org
-
-
- junit
- junit
- 3.8.1
- test
-
-
-
\ No newline at end of file
+
Modified:
maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java?view=diff&rev=519554&r1=519553&r2=519554
==
---
maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
(original)
+++
maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
Sat Mar 17 22:08:33 2007
@@ -23,7 +23,7 @@
import java.io.Writer;
import java.util.Map;
-import org.apache.maven.doxia.module.HtmlTools;
+import org.apache.maven.doxia.util.HtmlTools;
import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
import org.apache.maven.doxia.parser.Parser;
import org.apache.maven.doxia.sink.Sink;
@@ -33,7 +33,7 @@
/**
* A doxia sink which produces xhtml
*
- * @author mailto:[EMAIL PROTECTED]">Jason van Zyl
+ * @author Jason van Zyl
*/
public class XhtmlSink
extends AbstractXhtmlSink
Modified:
maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlParserTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlParserTest.java?view=diff&rev=519554&r1=519553&r2=519554
==
---
maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlParserTest.java
(original)
+++
maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlParserTest.java
Sat Mar 17 22:08:33 2007
@@ -40,7 +40,7 @@
protected String getDocument()
{
-return "src/test/site/xhtml/fun.html";
+return "src/test/resources/fun.html";
}
public void testParser()
Modified:
maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java?view=diff&rev=519554&r1=519553&r2=519554
==
---
maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
(original)
+++
maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
Sat Mar 17 22:08:33 2007
@@ -22,13 +22,19 @@
import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
import org.apache.maven.doxia.sink.AbstractSinkTestCase;
import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.parser.Parser;
import java.io.File;
import java.io.FileReader;
+import java.io.Reader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
import java.util.Map;
+import java.util.Collections;
+import java.util.HashMap;
/**
- * @author mailto:[EMAIL PROTECTED]">Jason van Zyl
+ * @author Jason van Zyl
* @version $Id:XhtmlSinkTest.java 348605 2005-11-24 12:02:44 +1100 (Thu, 24
Nov 2005) brett $
*/
public class XhtmlSinkTest
@@ -41,6 +47,11
svn commit: r519553 - in /maven/doxia/trunk/doxia-modules/doxia-module-xdoc: ./ src/main/java/org/apache/maven/doxia/module/xdoc/ src/main/resources/ src/main/resources/META-INF/ src/main/resources/ME
Author: jvanzyl
Date: Sat Mar 17 22:08:28 2007
New Revision: 519553
URL: http://svn.apache.org/viewvc?view=rev&rev=519553
Log:
decoupling module
Added:
maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/resources/
maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/resources/META-INF/
maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/resources/META-INF/plexus/
maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/resources/META-INF/plexus/components.xml
(with props)
maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/resources/
maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/resources/macro.xml
(with props)
maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/resources/report.xml
(with props)
maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/resources/toc.xml
(with props)
Modified:
maven/doxia/trunk/doxia-modules/doxia-module-xdoc/pom.xml
maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java
maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java
Modified: maven/doxia/trunk/doxia-modules/doxia-module-xdoc/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-xdoc/pom.xml?view=diff&rev=519553&r1=519552&r2=519553
==
--- maven/doxia/trunk/doxia-modules/doxia-module-xdoc/pom.xml (original)
+++ maven/doxia/trunk/doxia-modules/doxia-module-xdoc/pom.xml Sat Mar 17
22:08:28 2007
@@ -5,17 +5,5 @@
1.0-alpha-9-SNAPSHOT
4.0.0
- org.apache.maven.doxia
doxia-module-xdoc
- doxia-module-xdoc
- 1.0-SNAPSHOT
- http://maven.apache.org
-
-
- junit
- junit
- 3.8.1
- test
-
-
-
\ No newline at end of file
+
Modified:
maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java?view=diff&rev=519553&r1=519552&r2=519553
==
---
maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
(original)
+++
maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
Sat Mar 17 22:08:28 2007
@@ -21,10 +21,10 @@
import java.io.Writer;
-import org.apache.maven.doxia.module.HtmlTools;
-import org.apache.maven.doxia.module.apt.AptParser;
+import org.apache.maven.doxia.util.HtmlTools;
import org.apache.maven.doxia.sink.SinkAdapter;
import org.apache.maven.doxia.util.LineBreaker;
+import org.apache.maven.doxia.parser.Parser;
/**
* A doxia Sink which produces an xdoc model.
@@ -496,13 +496,13 @@
{
switch ( cellJustif[cellCount] )
{
-case AptParser.JUSTIFY_LEFT:
+case Parser.JUSTIFY_LEFT:
justif = "left";
break;
-case AptParser.JUSTIFY_RIGHT:
+case Parser.JUSTIFY_RIGHT:
justif = "right";
break;
-case AptParser.JUSTIFY_CENTER:
+case Parser.JUSTIFY_CENTER:
default:
justif = "center";
break;
Added:
maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/resources/META-INF/plexus/components.xml?view=auto&rev=519553
==
---
maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/resources/META-INF/plexus/components.xml
(added)
+++
maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/resources/META-INF/plexus/components.xml
Sat Mar 17 22:08:28 2007
@@ -0,0 +1,23 @@
+
+
+
+ org.apache.maven.doxia.parser.Parser
+ xdoc
+
org.apache.maven.doxia.module.xdoc.XdocParser
+
+
+ org.apache.maven.doxia.macro.manager.MacroManager
+ macroManager
+
+
+Parse an xdoc model and emit events into the specified doxia
+Sink.
+
+
+ org.apache.maven.doxia.site.module.SiteModule
+ xdoc
+
org.apache.maven.doxia.module.xdoc.XdocSiteModule
+
+
+
+
Propchange:
maven/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/resources/META-INF/plexus/components.xml
--
svn:eol-style = native
Pro
svn commit: r519555 - in /maven/doxia/trunk/doxia-modules: ./ doxia-module-docbook-simple/src/test/resources/ doxia-module-docbook-simple/src/test/site/ doxia-module-itext/src/test/resources/apt/
Author: jvanzyl Date: Sat Mar 17 22:11:24 2007 New Revision: 519555 URL: http://svn.apache.org/viewvc?view=rev&rev=519555 Log: (empty) Added: maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/resources/ maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/resources/guide.xml (with props) maven/doxia/trunk/doxia-modules/doxia-module-itext/src/test/resources/apt/apt.apt (with props) Removed: maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/site/ Modified: maven/doxia/trunk/doxia-modules/pom.xml Added: maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/resources/guide.xml URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/resources/guide.xml?view=auto&rev=519555 == --- maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/resources/guide.xml (added) +++ maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/resources/guide.xml Sat Mar 17 22:11:24 2007 @@ -0,0 +1,153 @@ + + + +http://www.oasis-open.org/docbook/xml/simple/1.0CR2/sdocbook.dtd";> + + + +Geotools2 Developer Guide + + + Cameron + + Shorter + + +22 May 2002 + + + Guide to aid geotools2 development. + + + + +Introduction + +This document aims to help new geotools developers get up to speed +and track practices of existing developers in order to keep the project +consistent. + +If you feel something is missing, feel free to contribute a new +section. + + + +Design + +Geotools Logo + + + + +Geotools Logo + + + +To do: ExplainKey design structure +(core interfaces, data sources, rendering, tools)Design +Drivers (Our design goals: modular, derives structure from netbeans, +support multiple version of java, ..)Directory + structure + + + +Development + + + Building + + To do:using antwhat + ant checksinsert the + "howto-build.html" doc into here + + + + Code Versioning (using CVS) + + To do:Point to sourceforge CVS howto + links.Also point to some HOWTOs for + windows users.What is acceptable to + commit to CVS, what is not. (Ie, code should compile)Talk + about version numbering convention, use of branches, etc (if we decide + to do this). + + To do: + + + + Coding Standards + + To do:Using Sun's coding + standard, need to note any exceptions to it.Note + the auto checking of coding standards.Javadocs + + + + Template File + + To do:Provide a template file.Link + it to sections explaining the different parts of the template.Include + headers, footers, example logging, example coding style, CVS key tags, + sample javadocs. + + + + Logging + + To do:Talk about log4j, links to + + + + Testing + + To do:Explain use of junit. Might be + a link to another web site. + + + + Documentation + + To do:Talk about docbook, why we + decided to use it (most commonly used format of LDP, converts to + multiple formats, tools coming which can support it. Need to mention + which version of docbook we are using.Mention + tools that can be used.Links to + docbook references.Process for + updating this document.How to use ant + tools to build doc. + + + + +Development Tools + + + Netbeans + + To do:Where to get it.Aim + is to make geotools a module within NetbeansHow + to setup getools to fit the multiple directory structureThe + extra Netbeans modules that are useful and should be downloaded. + + + + Propchange: maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/resources/guide.xml -- svn:eol-style = native Propchange: maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/resources/guide.xml -- svn:keywords = "Author Date Id Revision" Added: maven/doxia/trunk/doxia-modules/doxia-module-itext/src/test/resources/apt/apt.apt URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-itext/src/test/resources/apt/apt.apt?view=auto&rev=519555 == --- maven/doxia/trunk/doxia-modules/doxia-module-itext/src/test/resources/apt/apt.apt (added) +++ maven/doxia/trunk/doxia-modules/doxia-module-itext/src/test/resources/apt/apt.apt Sat Mar 17 22:11:24 2007 @@ -0,0 +1,207 @@ + -- + Guide to uploading artifacts to Ibiblio + -- + Jason van Zyl +
svn commit: r519556 - in /maven/doxia/trunk/doxia-modules/doxia-module-itext/src: main/resources/ test/resources/apt/apt.test
Author: jvanzyl
Date: Sat Mar 17 22:12:08 2007
New Revision: 519556
URL: http://svn.apache.org/viewvc?view=rev&rev=519556
Log: (empty)
Added:
maven/doxia/trunk/doxia-modules/doxia-module-itext/src/test/resources/apt/apt.test
Removed:
maven/doxia/trunk/doxia-modules/doxia-module-itext/src/main/resources/
Added:
maven/doxia/trunk/doxia-modules/doxia-module-itext/src/test/resources/apt/apt.test
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-itext/src/test/resources/apt/apt.test?view=auto&rev=519556
==
---
maven/doxia/trunk/doxia-modules/doxia-module-itext/src/test/resources/apt/apt.test
(added)
+++
maven/doxia/trunk/doxia-modules/doxia-module-itext/src/test/resources/apt/apt.test
Sat Mar 17 22:12:08 2007
@@ -0,0 +1,25 @@
+ --
+ Guide to uploading artifacts to Ibiblio
+ --
+ Jason van Zyl
+ --
+ 12 October 2005
+ --
+
+Guide to uploading artifacts to Ibiblio
+
+*-+-+--+---+
+| | Mirrors | Checksum | Signature |
+*-+-+--+---+
+| Maven 2.0.3 (tar.bz2) |
{{{http://www.apache.org/dyn/closer.cgi/maven/binaries/maven-2.0.3-bin.tar.bz2}
maven-2.0.3-bin.tar.bz2}} |
{{{http://www.apache.org/dist/maven/binaries/maven-2.0.3-bin.tar.bz2.md5}
maven-2.0.3-bin.tar.bz2.md5}} |
{{{http://www.apache.org/dist/maven/binaries/maven-2.0.3-bin.tar.bz2.asc}
maven-2.0.3-bin.tar.bz2.asc}} |
+*-+-+--+---+
+| Maven 2.0.3 (tar.gz) |
{{{http://www.apache.org/dyn/closer.cgi/maven/binaries/maven-2.0.3-bin.tar.gz}
maven-2.0.3-bin.tar.gz}} |
{{{http://www.apache.org/dist/maven/binaries/maven-2.0.3-bin.tar.gz.md5}
maven-2.0.3-bin.tar.gz.md5}} |
{{{http://www.apache.org/dist/maven/binaries/maven-2.0.3-bin.tar.gz.asc}
maven-2.0.3-bin.tar.gz.asc}} |
+*-+-+--+---+
+| Maven 2.0.3 (zip) |
{{{http://www.apache.org/dyn/closer.cgi/maven/binaries/maven-2.0.3-bin.zip}
maven-2.0.3-bin.zip}} |
{{{http://www.apache.org/dist/maven/binaries/maven-2.0.3-bin.zip.md5}
maven-2.0.3-bin.zip.md5}} |
{{{http://www.apache.org/dist/maven/binaries/maven-2.0.3-bin.zip.asc}
maven-2.0.3-bin.zip.asc}} |
+*-+-+--+---+
+| Maven 2.0.3 Tasks for Ant |
{{{http://www.apache.org/dyn/closer.cgi/maven/binaries/maven-artifact-ant-2.0.3-dep.jar}
maven-artifact-ant-2.0.3-dep.jar}} |
{{{http://www.apache.org/dist/maven/binaries/maven-artifact-ant-2.0.3-dep.jar.md5}
maven-artifact-ant-2.0.3-dep.jar.md5}} |
{{{http://www.apache.org/dist/maven/binaries/maven-artifact-ant-2.0.3-dep.jar.asc}
maven-artifact-ant-2.0.3-dep.jar.asc}} |
+*-+-+--+---+
+| Maven 2.0.3 Embedder |
{{{http://www.apache.org/dyn/closer.cgi/maven/binaries/maven-embedder-2.0.3-dep.jar}
maven-embedder-2.0.3-dep.jar}} |
{{{http://www.apache.org/dist/maven/binaries/maven-embedder-2.0.3-dep.jar.md5}
maven-embedder-2.0.3-dep.jar.md5}} |
{{{http://www.apache.org/dist/maven/binaries/maven-embedder-2.0.3-dep.jar.asc}
maven-embedder-2.0.3-dep.jar.asc}} |
+*-+-+--+---+
+Table caption
+
svn commit: r519557 - in /maven/doxia/trunk: ./ doxia-decoration-model/ doxia-doc-renderer/ doxia-site-renderer/ doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/ doxia-site-rende
Author: jvanzyl
Date: Sat Mar 17 22:12:27 2007
New Revision: 519557
URL: http://svn.apache.org/viewvc?view=rev&rev=519557
Log: (empty)
Modified:
maven/doxia/trunk/doxia-decoration-model/pom.xml
maven/doxia/trunk/doxia-doc-renderer/pom.xml
maven/doxia/trunk/doxia-site-renderer/pom.xml
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java
maven/doxia/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
maven/doxia/trunk/doxia-site-renderer/src/test/site/xdoc/macro.xml
maven/doxia/trunk/pom.xml
Modified: maven/doxia/trunk/doxia-decoration-model/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-decoration-model/pom.xml?view=diff&rev=519557&r1=519556&r2=519557
==
--- maven/doxia/trunk/doxia-decoration-model/pom.xml (original)
+++ maven/doxia/trunk/doxia-decoration-model/pom.xml Sat Mar 17 22:12:27 2007
@@ -66,15 +66,8 @@
- junit
- junit
- 3.8.1
- test
-
-
org.codehaus.plexus
plexus-utils
- 1.0.4
Modified: maven/doxia/trunk/doxia-doc-renderer/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-doc-renderer/pom.xml?view=diff&rev=519557&r1=519556&r2=519557
==
--- maven/doxia/trunk/doxia-doc-renderer/pom.xml (original)
+++ maven/doxia/trunk/doxia-doc-renderer/pom.xml Sat Mar 17 22:12:27 2007
@@ -72,13 +72,11 @@
org.apache.maven.doxia
doxia-module-itext
- 1.0-SNAPSHOT
+ ${projectVersion}
-
org.codehaus.plexus
plexus-utils
- 1.2
xalan
Modified: maven/doxia/trunk/doxia-site-renderer/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-site-renderer/pom.xml?view=diff&rev=519557&r1=519556&r2=519557
==
--- maven/doxia/trunk/doxia-site-renderer/pom.xml (original)
+++ maven/doxia/trunk/doxia-site-renderer/pom.xml Sat Mar 17 22:12:27 2007
@@ -43,7 +43,10 @@
org.apache.maven.doxia
doxia-core
- ${project.version}
+
+
+ org.apache.maven.doxia
+ doxia-sink-api
org.codehaus.plexus
@@ -53,18 +56,39 @@
org.codehaus.plexus
plexus-velocity
- 1.1.3
+ 1.1.5
org.apache.maven.doxia
doxia-decoration-model
- 1.0-alpha-8
htmlunit
htmlunit
1.9
test
+
+
+ commons-collections
+ commons-collections
+ 3.2
+
+
+ org.apache.maven.doxia
+ doxia-module-xhtml
+ ${projectVersion}
+
+
+
+ org.apache.maven.doxia
+ doxia-module-apt
+ ${projectVersion}
+
+
+ org.apache.maven.doxia
+ doxia-module-xdoc
+ ${projectVersion}
Modified:
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java?view=diff&rev=519557&r1=519556&r2=519557
==
---
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
(original)
+++
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
Sat Mar 17 22:12:27 2007
@@ -19,6 +19,29 @@
* under the License.
*/
+import org.apache.maven.doxia.Doxia;
+import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
+import org.apache.maven.doxia.parser.ParseException;
+import org.apache.maven.doxia.parser.manager.ParserNotFoundException;
+import org.apache.maven.doxia.site.decoration.DecorationModel;
+import org.apache.maven.doxia.site.module.SiteModule;
+import org.apache.maven.doxia.site.module.manager.SiteModuleManager;
+import org.apache.maven.doxia.site.module.manager.SiteModuleNotFoundException;
+import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.context.Context;
+import org.codehaus.plexus.i18n.I18N;
+import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.codehaus.plexus.util.DirectoryScanner;
+import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.Os;
+import org.codehaus.plexus.util.PathTool;
+import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.velocity.Vel
svn commit: r519558 - /maven/doxia/trunk/doxia-site-renderer/src/test/site/apt/interpolation.apt
Author: jvanzyl
Date: Sat Mar 17 22:13:24 2007
New Revision: 519558
URL: http://svn.apache.org/viewvc?view=rev&rev=519558
Log: (empty)
Added:
maven/doxia/trunk/doxia-site-renderer/src/test/site/apt/interpolation.apt
(with props)
Added: maven/doxia/trunk/doxia-site-renderer/src/test/site/apt/interpolation.apt
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-site-renderer/src/test/site/apt/interpolation.apt?view=auto&rev=519558
==
--- maven/doxia/trunk/doxia-site-renderer/src/test/site/apt/interpolation.apt
(added)
+++ maven/doxia/trunk/doxia-site-renderer/src/test/site/apt/interpolation.apt
Sat Mar 17 22:13:24 2007
@@ -0,0 +1,13 @@
+ -
+ Project goodies that are available in the project
+ -
+ Maven Monkey
+ -
+
+ -
+
+Things you can do with Velocity
+
+ * project = ${project.name} ${project.version}
+ * $currentFileName
+
Propchange:
maven/doxia/trunk/doxia-site-renderer/src/test/site/apt/interpolation.apt
--
svn:eol-style = native
Propchange:
maven/doxia/trunk/doxia-site-renderer/src/test/site/apt/interpolation.apt
--
svn:keywords = "Author Date Id Revision"
svn commit: r519560 - /maven/doxia/trunk/doxia-core/src/main/resources/
Author: jvanzyl Date: Sat Mar 17 22:23:11 2007 New Revision: 519560 URL: http://svn.apache.org/viewvc?view=rev&rev=519560 Log: o more stuff that's not used Removed: maven/doxia/trunk/doxia-core/src/main/resources/
svn commit: r519561 - /maven/doxia/trunk/doxia-core/src/test/resources/
Author: jvanzyl Date: Sat Mar 17 22:24:10 2007 New Revision: 519561 URL: http://svn.apache.org/viewvc?view=rev&rev=519561 Log: (empty) Removed: maven/doxia/trunk/doxia-core/src/test/resources/
