svn commit: r375392 - in /maven/doxia/trunk: doxia-module-twiki/ doxia-modules/ doxia-modules/doxia-module-twiki/

2006-02-06 Thread jvanzyl 
Author: jvanzyl
Date: Mon Feb  6 13:55:59 2006
New Revision: 375392

URL: http://svn.apache.org/viewcvs?rev=375392&view=rev
Log:
[DOXIA-45] moving the twiki module

Added:
maven/doxia/trunk/doxia-modules/
maven/doxia/trunk/doxia-modules/doxia-module-twiki/
  - copied from r368739, maven/doxia/trunk/doxia-module-twiki/
Removed:
maven/doxia/trunk/doxia-module-twiki/

svn commit: r375400 [2/2] - in /maven/doxia/trunk/doxia-modules: doxia-module-confluence/ doxia-module-confluence/src/ doxia-module-confluence/src/main/ doxia-module-confluence/src/main/java/ doxia-mo

2006-02-06 Thread jvanzyl 
Added: 
maven/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java
URL: 
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java?rev=375400&view=auto
==
--- 
maven/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java
 (added)
+++ 
maven/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java
 Mon Feb  6 14:31:55 2006
@@ -0,0 +1,103 @@
+package org.apache.maven.doxia.module.confluence.parser.table;
+
+/*
+ * Copyright 2004-2005 The Apache Software Foundation.
+ *
+ * Licensed 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.util.ArrayList;
+import java.util.List;
+
+import org.apache.maven.doxia.module.common.ByLineSource;
+import org.apache.maven.doxia.module.confluence.parser.BlockParser;
+import org.apache.maven.doxia.module.confluence.parser.Block;
+import org.apache.maven.doxia.module.confluence.parser.BoldBlock;
+import org.apache.maven.doxia.module.confluence.parser.TextBlock;
+import org.apache.maven.doxia.parser.ParseException;
+import org.codehaus.plexus.util.StringUtils;
+
+
+/**
+ * Parse tables
+ *
+ * @author Juan F. Codagnone
+ * @since Nov 9, 2005
+ */
+public class TableBlockParser
+implements BlockParser
+{
+public  boolean accept( String line, ByLineSource source )
+{
+return line.startsWith( "|" );
+}
+
+public  Block visit(  String line,  ByLineSource source )
+throws ParseException
+{
+if ( !accept( line, source ) )
+{
+throw new IllegalAccessError( "call accept before this ;)" );
+}
+
+ List rows = new ArrayList();
+
+String l = line;
+
+do
+{
+List cells = new ArrayList();
+
+if ( l.startsWith( "||" ) )
+{
+String[] text = StringUtils.split( l, "||" );
+
+
+for ( int i = 0; i < text.length; i++ )
+{
+List textBlocks = new ArrayList();
+
+textBlocks.add( new TextBlock( text[i] ) );
+
+List blocks = new ArrayList();
+
+blocks.add( new BoldBlock( textBlocks ) );
+
+cells.add( new TableCellHeaderBlock( blocks ) );
+}
+}
+else
+{
+String[] text = StringUtils.split( l, "|" );
+
+
+for ( int i = 0; i < text.length; i++ )
+{
+List blocks = new ArrayList();
+
+blocks.add( new TextBlock( text[i] ) );
+
+cells.add( new TableCellBlock( blocks ) );
+}
+}
+
+rows.add( new TableRowBlock( cells ) );
+}
+
+while ( ( l = source.getNextLine() ) != null && accept( l, source ) );
+
+assert rows.size() >= 1;
+
+return new TableBlock( rows );
+}
+}

Propchange: 
maven/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java
--
svn:eol-style = native

Propchange: 
maven/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java
--
svn:keywords = "Author Date Id Revision"

Added: 
maven/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableCellBlock.java
URL: 
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableCellBlock.java?rev=375400&view=auto
==
--- 
maven/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableCellBlock.java
 (added)
+++ 
maven/doxia/trunk/doxia-modules/doxia-module-conf

svn commit: r375402 - /maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/

2006-02-06 Thread jvanzyl 
Author: jvanzyl
Date: Mon Feb  6 14:34:01 2006
New Revision: 375402

URL: http://svn.apache.org/viewcvs?rev=375402&view=rev
Log:
o moved confluence module into its own build

Removed:

maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/

svn commit: r375450 - in /maven/doxia/trunk: doxia-site/ doxia-site/pom.xml doxia-site/src/ pom.xml src/

2006-02-06 Thread jvanzyl 
Author: jvanzyl
Date: Mon Feb  6 19:00:29 2006
New Revision: 375450

URL: http://svn.apache.org/viewcvs?rev=375450&view=rev
Log:
o making doxia-site directory

Added:
maven/doxia/trunk/doxia-site/
maven/doxia/trunk/doxia-site/pom.xml   (with props)
maven/doxia/trunk/doxia-site/src/
  - copied from r375393, maven/doxia/trunk/src/
Removed:
maven/doxia/trunk/src/
Modified:
maven/doxia/trunk/pom.xml

Added: maven/doxia/trunk/doxia-site/pom.xml
URL: 
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-site/pom.xml?rev=375450&view=auto
==
--- maven/doxia/trunk/doxia-site/pom.xml (added)
+++ maven/doxia/trunk/doxia-site/pom.xml Mon Feb  6 19:00:29 2006
@@ -0,0 +1,11 @@
+
+  4.0.0
+  
+doxia
+org.apache.maven.doxia
+1.0-alpha-8-SNAPSHOT
+  
+  doxia-site
+  Doxia
+  1.0-alpha-8-SNAPSHOT
+

Propchange: maven/doxia/trunk/doxia-site/pom.xml
--
svn:eol-style = native

Propchange: maven/doxia/trunk/doxia-site/pom.xml
--
svn:keywords = "Author Date Id Revision"

Modified: maven/doxia/trunk/pom.xml
URL: 
http://svn.apache.org/viewcvs/maven/doxia/trunk/pom.xml?rev=375450&r1=375449&r2=375450&view=diff
==
--- maven/doxia/trunk/pom.xml (original)
+++ maven/doxia/trunk/pom.xml Mon Feb  6 19:00:29 2006
@@ -89,6 +89,7 @@
 doxia-sink-api
 doxia-site-renderer
 doxia-decoration-model
+doxia-modules
   
   
 
@@ -106,4 +107,4 @@
   scp://minotaur.apache.org/www/maven.apache.org/doxia/
 
   
-
\ No newline at end of file
+

svn commit: r375475 - in /maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia: ./ module/docbook/ module/fml/ module/latex/ module/rtf/ module/xdoc/ module/xhtml/

2006-02-06 Thread jvanzyl 
Author: jvanzyl
Date: Mon Feb  6 20:27:21 2006
New Revision: 375475

URL: http://svn.apache.org/viewcvs?rev=375475&view=rev
Log:
o placing all the tests into the correct packages, looking forward to 
separating all the modules into their own builds

Added:

maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java
   (contents, props changed)
  - copied, changed from r375393, 
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/DocBookSinkTest.java

maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/fml/

maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java
   (contents, props changed)
  - copied, changed from r375393, 
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/FmlParserTest.java

maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/latex/

maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java
   (contents, props changed)
  - copied, changed from r375393, 
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/LatexSinkTest.java

maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/rtf/

maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/rtf/RtfSinkTest.java
   (contents, props changed)
  - copied, changed from r375393, 
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/RtfSinkTest.java

maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/xdoc/

maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java
   (contents, props changed)
  - copied, changed from r375393, 
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/XdocParserTest.java

maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java
   (contents, props changed)
  - copied, changed from r375393, 
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/XdocSinkTest.java

maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
   (contents, props changed)
  - copied, changed from r375393, 
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/XhtmlSinkTest.java
Removed:

maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/DocBookSinkTest.java

maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/FmlParserTest.java

maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/LatexSinkTest.java

maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/RtfSinkTest.java

maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/XdocParserTest.java

maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/XdocSinkTest.java

maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/XhtmlSinkTest.java

Copied: 
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java
 (from r375393, 
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/DocBookSinkTest.java)
URL: 
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java?p2=maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java&p1=maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/DocBookSinkTest.java&r1=375393&r2=375475&rev=375475&view=diff
==
--- 
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/DocBookSinkTest.java
 (original)
+++ 
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java
 Mon Feb  6 20:27:21 2006
@@ -1,4 +1,4 @@
-package org.apache.maven.doxia;
+package org.apache.maven.doxia.module.docbook;
 
 /*
  * Copyright 2004-2005 The Apache Software Foundation.
@@ -18,6 +18,7 @@
 
 import org.apache.maven.doxia.module.docbook.DocBookSink;
 import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.AbstractSinkTestCase;
 
 /**
  * @author mailto:[EMAIL PROTECTED]">Jason van Zyl

Propchange: 
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java
--
svn:eol-style = native

Propchange: 
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java
--
svn:keywords = Author Date Id Revision

Copied: 
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java
 (from r375393, 
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/FmlParserTest.java)
URL: 
http:/

svn commit: r375477 - in /maven/doxia/trunk/doxia-core/src/test/resources: examples.apt.jvz examples.apt.org examples.mif

2006-02-06 Thread jvanzyl 
Author: jvanzyl
Date: Mon Feb  6 20:29:18 2006
New Revision: 375477

URL: http://svn.apache.org/viewcvs?rev=375477&view=rev
Log:
o removing cruft

Removed:
maven/doxia/trunk/doxia-core/src/test/resources/examples.apt.jvz
maven/doxia/trunk/doxia-core/src/test/resources/examples.apt.org
maven/doxia/trunk/doxia-core/src/test/resources/examples.mif

svn commit: r375480 - in /maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia: ./ module/docbook/ module/latex/ module/rtf/ module/xdoc/ module/xhtml/ sink/

2006-02-06 Thread jvanzyl 
Author: jvanzyl
Date: Mon Feb  6 20:35:47 2006
New Revision: 375480

URL: http://svn.apache.org/viewcvs?rev=375480&view=rev
Log:
o putting classes in more appropriate packages

Added:
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/

maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTestCase.java
   (contents, props changed)
  - copied, changed from r375393, 
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/AbstractSinkTestCase.java
Removed:

maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/AbstractSinkTestCase.java
Modified:

maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java

maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java

maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/rtf/RtfSinkTest.java

maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java

maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java

Modified: 
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java
URL: 
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java?rev=375480&r1=375479&r2=375480&view=diff
==
--- 
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java
 (original)
+++ 
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java
 Mon Feb  6 20:35:47 2006
@@ -18,7 +18,7 @@
 
 import org.apache.maven.doxia.module.docbook.DocBookSink;
 import org.apache.maven.doxia.sink.Sink;
-import org.apache.maven.doxia.AbstractSinkTestCase;
+import org.apache.maven.doxia.sink.AbstractSinkTestCase;
 
 /**
  * @author mailto:[EMAIL PROTECTED]">Jason van Zyl

Modified: 
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java
URL: 
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java?rev=375480&r1=375479&r2=375480&view=diff
==
--- 
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java
 (original)
+++ 
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java
 Mon Feb  6 20:35:47 2006
@@ -18,7 +18,7 @@
 
 import org.apache.maven.doxia.module.latex.LatexSink;
 import org.apache.maven.doxia.sink.Sink;
-import org.apache.maven.doxia.AbstractSinkTestCase;
+import org.apache.maven.doxia.sink.AbstractSinkTestCase;
 
 /**
  * @author mailto:[EMAIL PROTECTED]">Jason van Zyl

Modified: 
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/rtf/RtfSinkTest.java
URL: 
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/rtf/RtfSinkTest.java?rev=375480&r1=375479&r2=375480&view=diff
==
--- 
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/rtf/RtfSinkTest.java
 (original)
+++ 
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/rtf/RtfSinkTest.java
 Mon Feb  6 20:35:47 2006
@@ -18,7 +18,7 @@
 
 import org.apache.maven.doxia.module.rtf.RtfSink;
 import org.apache.maven.doxia.sink.Sink;
-import org.apache.maven.doxia.AbstractSinkTestCase;
+import org.apache.maven.doxia.sink.AbstractSinkTestCase;
 
 import java.io.File;
 import java.io.FileOutputStream;

Modified: 
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java
URL: 
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java?rev=375480&r1=375479&r2=375480&view=diff
==
--- 
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java
 (original)
+++ 
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java
 Mon Feb  6 20:35:47 2006
@@ -18,7 +18,7 @@
 
 import org.apache.maven.doxia.module.xdoc.XdocSink;
 import org.apache.maven.doxia.sink.Sink;
-import org.apache.maven.doxia.AbstractSinkTestCase;
+import org.apache.maven.doxia.sink.AbstractSinkTestCase;
 
 /**
  * @author mailto:[EMAIL PROTECTED]">Jason van Zyl

Modified: 
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
URL: 
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java?rev=375480&r1=375479&r2=375480&view

svn commit: r375481 - /maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/SinkDescriptorReaderTest.java

2006-02-06 Thread jvanzyl 
Author: jvanzyl
Date: Mon Feb  6 20:37:30 2006
New Revision: 375481

URL: http://svn.apache.org/viewcvs?rev=375481&view=rev
Log:
o removing useless test

Removed:

maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/SinkDescriptorReaderTest.java

svn commit: r375483 - in /maven/doxia/trunk/doxia-modules: doxia-module-docbook/ doxia-modules-docbook/

2006-02-06 Thread jvanzyl 
Author: jvanzyl
Date: Mon Feb  6 20:47:03 2006
New Revision: 375483

URL: http://svn.apache.org/viewcvs?rev=375483&view=rev
Log:
o named the docbook module incorrectly

Added:
maven/doxia/trunk/doxia-modules/doxia-module-docbook/
  - copied from r375482, 
maven/doxia/trunk/doxia-modules/doxia-modules-docbook/
Removed:
maven/doxia/trunk/doxia-modules/doxia-modules-docbook/

svn commit: r375490 - /maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/docbook/

2006-02-06 Thread jvanzyl 
Author: jvanzyl
Date: Mon Feb  6 21:32:10 2006
New Revision: 375490

URL: http://svn.apache.org/viewcvs?rev=375490&view=rev
Log: (empty)

Removed:

maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/docbook/

svn commit: r375493 - in /maven/doxia/trunk: doxia-core/pom.xml doxia-modules/doxia-module-docbook/pom.xml doxia-modules/doxia-module-docbook/src/test/java/org/apache/maven/doxia/module/docbook/DocBoo

2006-02-06 Thread jvanzyl 
Author: jvanzyl
Date: Mon Feb  6 21:40:40 2006
New Revision: 375493

URL: http://svn.apache.org/viewcvs?rev=375493&view=rev
Log:
o getting the modules to work

Modified:
maven/doxia/trunk/doxia-core/pom.xml
maven/doxia/trunk/doxia-modules/doxia-module-docbook/pom.xml

maven/doxia/trunk/doxia-modules/doxia-module-docbook/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java
maven/doxia/trunk/doxia-modules/doxia-module-twiki/pom.xml

Modified: maven/doxia/trunk/doxia-core/pom.xml
URL: 
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/pom.xml?rev=375493&r1=375492&r2=375493&view=diff
==
--- maven/doxia/trunk/doxia-core/pom.xml (original)
+++ maven/doxia/trunk/doxia-core/pom.xml Mon Feb  6 21:40:40 2006
@@ -16,7 +16,18 @@
   1.4
   1.4
 
-  
+ 
+ 
+   org.apache.maven.plugins
+   maven-jar-plugin
+   
+ 
+   
+ test-jar
+   
+ 
+   
+ 
 
   
   
@@ -42,4 +53,4 @@
   test
 
   
-
\ No newline at end of file
+

Modified: maven/doxia/trunk/doxia-modules/doxia-module-docbook/pom.xml
URL: 
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-modules/doxia-module-docbook/pom.xml?rev=375493&r1=375492&r2=375493&view=diff
==
--- maven/doxia/trunk/doxia-modules/doxia-module-docbook/pom.xml (original)
+++ maven/doxia/trunk/doxia-modules/doxia-module-docbook/pom.xml Mon Feb  6 
21:40:40 2006
@@ -1,24 +1,11 @@
 
   4.0.0
   
-doxia
+doxia-modules
 org.apache.maven.doxia
 1.0-alpha-8-SNAPSHOT
   
   doxia-module-docbook
   Doxia Docbook Module
   1.0-alpha-8-SNAPSHOT
-  
-
-  org.apache.maven.doxia
-  doxia-core
-  1.0-alpha-8-SNAPSHOT
-
-
-  junit
-  junit
-  3.8.1
-  test
-
-  
 

Modified: 
maven/doxia/trunk/doxia-modules/doxia-module-docbook/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java
URL: 
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-modules/doxia-module-docbook/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java?rev=375493&r1=375492&r2=375493&view=diff
==
--- 
maven/doxia/trunk/doxia-modules/doxia-module-docbook/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java
 (original)
+++ 
maven/doxia/trunk/doxia-modules/doxia-module-docbook/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java
 Mon Feb  6 21:40:40 2006
@@ -16,9 +16,8 @@
  * limitations under the License.
  */
 
-import org.apache.maven.doxia.module.docbook.DocBookSink;
+import org.apache.maven.doxia.sink.AbstractSinkTestCase;
 import org.apache.maven.doxia.sink.Sink;
-import org.apache.maven.doxia.AbstractSinkTestCase;
 
 /**
  * @author mailto:[EMAIL PROTECTED]">Jason van Zyl

Modified: maven/doxia/trunk/doxia-modules/doxia-module-twiki/pom.xml
URL: 
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-modules/doxia-module-twiki/pom.xml?rev=375493&r1=375492&r2=375493&view=diff
==
--- maven/doxia/trunk/doxia-modules/doxia-module-twiki/pom.xml (original)
+++ maven/doxia/trunk/doxia-modules/doxia-module-twiki/pom.xml Mon Feb  6 
21:40:40 2006
@@ -1,7 +1,7 @@
 
   4.0.0
   
-doxia
+doxia-modules
 org.apache.maven.doxia
 1.0-alpha-8-SNAPSHOT

svn commit: r375496 - /maven/doxia/trunk/doxia-core/pom.xml

2006-02-06 Thread jvanzyl 
Author: jvanzyl
Date: Mon Feb  6 21:46:33 2006
New Revision: 375496

URL: http://svn.apache.org/viewcvs?rev=375496&view=rev
Log:
o plexus container is a compile/runtime dep

Modified:
maven/doxia/trunk/doxia-core/pom.xml

Modified: maven/doxia/trunk/doxia-core/pom.xml
URL: 
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/pom.xml?rev=375496&r1=375495&r2=375496&view=diff
==
--- maven/doxia/trunk/doxia-core/pom.xml (original)
+++ maven/doxia/trunk/doxia-core/pom.xml Mon Feb  6 21:46:33 2006
@@ -50,7 +50,6 @@
   org.codehaus.plexus
   plexus-container-default
   1.0-alpha-8
-  test

svn commit: r375498 - /maven/doxia/trunk/doxia-core/pom.xml

2006-02-06 Thread jvanzyl 
Author: jvanzyl
Date: Mon Feb  6 21:52:04 2006
New Revision: 375498

URL: http://svn.apache.org/viewcvs?rev=375498&view=rev
Log:
o everything builds now

Modified:
maven/doxia/trunk/doxia-core/pom.xml

Modified: maven/doxia/trunk/doxia-core/pom.xml
URL: 
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/pom.xml?rev=375498&r1=375497&r2=375498&view=diff
==
--- maven/doxia/trunk/doxia-core/pom.xml (original)
+++ maven/doxia/trunk/doxia-core/pom.xml Mon Feb  6 21:52:04 2006
@@ -50,6 +50,7 @@
   org.codehaus.plexus
   plexus-container-default
   1.0-alpha-8
+  runtime

svn commit: r375499 - /maven/doxia/trunk/doxia-core/src/test/site/docbook/

2006-02-06 Thread jvanzyl 
Author: jvanzyl
Date: Mon Feb  6 21:55:17 2006
New Revision: 375499

URL: http://svn.apache.org/viewcvs?rev=375499&view=rev
Log:
o docbook stuff in now in the module

Removed:
maven/doxia/trunk/doxia-core/src/test/site/docbook/

svn commit: r375500 - in /maven/doxia/trunk/doxia-modules/doxia-module-docbook/src/test/site: ./ docbook/ docbook/guide.xml

2006-02-06 Thread jvanzyl 
Author: jvanzyl
Date: Mon Feb  6 21:55:42 2006
New Revision: 375500

URL: http://svn.apache.org/viewcvs?rev=375500&view=rev
Log:
adding test doc

Added:
maven/doxia/trunk/doxia-modules/doxia-module-docbook/src/test/site/
maven/doxia/trunk/doxia-modules/doxia-module-docbook/src/test/site/docbook/

maven/doxia/trunk/doxia-modules/doxia-module-docbook/src/test/site/docbook/guide.xml
   (with props)

Added: 
maven/doxia/trunk/doxia-modules/doxia-module-docbook/src/test/site/docbook/guide.xml
URL: 
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-modules/doxia-module-docbook/src/test/site/docbook/guide.xml?rev=375500&view=auto
==
--- 
maven/doxia/trunk/doxia-modules/doxia-module-docbook/src/test/site/docbook/guide.xml
 (added)
+++ 
maven/doxia/trunk/doxia-modules/doxia-module-docbook/src/test/site/docbook/guide.xml
 Mon Feb  6 21:55:42 2006
@@ -0,0 +1,134 @@
+
+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/src/test/site/docbook/guide.xml
--
svn:eol-style = native

Propchange: 
maven/doxia/trunk/doxia-modules/doxia-module-docbook/src/test/site/docbook/guide.xml
--
svn:keywords = "Author Date Id Revision"

svn commit: r375502 - in /maven/doxia/trunk: doxia-core/src/test/site/confluence/ doxia-modules/doxia-module-confluence/src/test/ doxia-modules/doxia-module-confluence/src/test/site/ doxia-modules/dox

2006-02-06 Thread jvanzyl 
Author: jvanzyl
Date: Mon Feb  6 21:58:22 2006
New Revision: 375502

URL: http://svn.apache.org/viewcvs?rev=375502&view=rev
Log:
o moving confluence test docs


Added:
maven/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/
maven/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/site/

maven/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/site/confluence/

maven/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/site/confluence/faq.confluence

maven/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/site/confluence/page.confluence
Removed:
maven/doxia/trunk/doxia-core/src/test/site/confluence/

Added: 
maven/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/site/confluence/faq.confluence
URL: 
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/site/confluence/faq.confluence?rev=375502&view=auto
==
--- 
maven/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/site/confluence/faq.confluence
 (added)
+++ 
maven/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/site/confluence/faq.confluence
 Mon Feb  6 21:58:22 2006
@@ -0,0 +1,228 @@
+*NOTE:* _This page contains drafts of user contributed FAQ entries. The 
content you see here might not be fully fool-proof or might not comply with the 
best practices promoted by Maven. What is only guaranteed is that they have 
worked once for some members. It is best to treat these items as "works in 
progress" until they have been reviewed and promoted to the main Maven 
documentation site._
+
+Users may also list questions here that they would like answered. So this page 
can serve as a collection of questions that users would like answered. Please 
put unanswered questions at the bottom. Please follow the format that is being 
used because it will help in our automated exaction of material which can then 
be incorporated into the main site.
+
+h1. Answered Questions
+
+h3. Why am I getting a " does not exist or no valid version" 
error? 
+
+This means that Maven is unable to access the required plugin from your local 
repository, and unable to access the official or 'central' Maven2 plugin 
repository. 
+
+You may troubleshoot the problem by performing the following actions: 
+# If you are behind a http proxy, please check the Maven2 [proxy settings 
guide|http://maven.apache.org/guides/mini/guide-proxies.html]. 
+# If the plugin you seek cannot be redistributed freely then you may [add it 
manually to your 
repository|http://maven.apache.org/guides/mini/guide-coping-with-sun-jars.html].
 
+
+If the problem still persists you may seek help from the Maven user list, 
browse [archived 
discussions|http://www.mail-archive.com/users@maven.apache.org/], or log a 
[ticket|http://jira.codehaus.org/browse/MNG] describing your problem if you 
think you have found a bug. Tickets could also be issued for feature 
enhancement requests, and other tasks.
+
+h3. How do I install a file in my local repository along with a generic Pom?
+
+This solution requires at least 2.0.1-SNAPSHOT or above version of Maven 2. 
You may do this by typing this command (please take note that this is a single 
line only).
+
+{code}
+mvn install:install-file 
+  -DgroupId= 
+  -DartifactId=
+  -Dversion=
+  -Dfile=
+  -Dpackaging= (i.e. jar)
+  -DgeneratePom=true
+{code}
+
+This command installs the jar in your local repository with the generated 
generic pom.
+
+h3. How do I install a file in my local repository along with my customed Pom?
+
+The solution requires at least 2.0.1-SNAPSHOT or above version of Maven 2 and 
add the -DpomFile= parameter just like the sample below.
+
+{code}
+mvn install:install-file 
+  -DgroupId= 
+  -DartifactId=
+  -Dversion=
+  -Dfile=
+  -Dpackaging= (i.e. jar)
+  -DpomFile=
+{code}
+
+This command will install the file in your local repository along with your 
customed pom.
+
+h3. Are there any ways of including/excluding the other modules in the 
navigation menu in the parent site?
+
+[http://jira.codehaus.org/browse/MNG-661], provides a simple patch which 
provides parent and module links using the project URLs which as you
+correctly point out only work when the site is deployed.
+
+h3. Where is the __ plugin?
+
+If you cannot find a certain plugin, you may want to take a look on the 
following sites. 
+
+# http://mojo.codehaus.org  
+# https://svn.codehaus.org/mojo/trunk/mojo
+# https://svn.codehaus.org/mojo/trunk/mojo/mojo-sandbox
+
+h3. Why are there no pre/post goals in Maven 2.x?
+
+In Maven 1.x, pre/postGoals were used to inject custom behavior to the build 
process. This caused a problem, since declaring your code to be a preGoal of 
some other goal meant that you depended on that specific goal, rather than the 
work it did. It also caused confusion when trying to inject other behavior into 
a build

svn commit: r375508 - in /maven/doxia/trunk/doxia-modules: doxia-module-docbook-simple/ doxia-module-docbook-simple/pom.xml doxia-module-docbook-simple/src/ doxia-module-docbook/

2006-02-06 Thread jvanzyl 
Author: jvanzyl
Date: Mon Feb  6 22:13:16 2006
New Revision: 375508

URL: http://svn.apache.org/viewcvs?rev=375508&view=rev
Log:
o moving the current docbook module to a simple version and making way for a 
full version by lars

Added:
maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/
  - copied from r375483, 
maven/doxia/trunk/doxia-modules/doxia-module-docbook/
maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/pom.xml
  - copied unchanged from r375507, 
maven/doxia/trunk/doxia-modules/doxia-module-docbook/pom.xml
maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/
  - copied from r375507, 
maven/doxia/trunk/doxia-modules/doxia-module-docbook/src/
Removed:
maven/doxia/trunk/doxia-modules/doxia-module-docbook/

svn commit: r375510 - /maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/pom.xml

2006-02-06 Thread jvanzyl 
Author: jvanzyl
Date: Mon Feb  6 22:14:12 2006
New Revision: 375510

URL: http://svn.apache.org/viewcvs?rev=375510&view=rev
Log:
o switch over to docbook simple

Modified:
maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/pom.xml

Modified: maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/pom.xml
URL: 
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/pom.xml?rev=375510&r1=375509&r2=375510&view=diff
==
--- maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/pom.xml 
(original)
+++ maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/pom.xml Mon Feb 
 6 22:14:12 2006
@@ -5,7 +5,7 @@
 org.apache.maven.doxia
 1.0-alpha-8-SNAPSHOT
   
-  doxia-module-docbook
-  Doxia Docbook Module
+  doxia-module-docbook-simple
+  Doxia Docbook Simple Module
   1.0-alpha-8-SNAPSHOT

svn commit: r375515 - /maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/decoration/model/

2006-02-06 Thread jvanzyl 
Author: jvanzyl
Date: Mon Feb  6 22:39:16 2006
New Revision: 375515

URL: http://svn.apache.org/viewcvs?rev=375515&view=rev
Log:
o these classes are now generated in the site-decoration-model module

Removed:

maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/decoration/model/