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 @@
</parent>
<artifactId>doxia-module-twiki</artifactId>
<name>Doxia TWiki Module</name>
- <version>1.0-alpha-9-SNAPSHOT</version>
- <developers>
+ <developers>
<developer>
<name>Juan F. Codagnone</name>
<email>juan *at* zauber dot. com dot. ar</email>
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 <a href="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-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/BlockParser.java
(original)
+++
maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/BlockParser.java
Sat Mar 17 22:08:21 2007
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.apache.maven.doxia.module.common.ByLineSource;
+import org.apache.maven.doxia.util.ByLineSource;
import org.apache.maven.doxia.parser.ParseException;
/**
Modified:
maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/GenericListBlockParser.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/GenericListBlockParser.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/parser/GenericListBlockParser.java
(original)
+++
maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/GenericListBlockParser.java
Sat Mar 17 22:08:21 2007
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.apache.maven.doxia.module.common.ByLineSource;
+import org.apache.maven.doxia.util.ByLineSource;
import org.apache.maven.doxia.parser.ParseException;
import org.apache.maven.doxia.sink.Sink;
@@ -76,7 +76,7 @@
}
/**
- * @see BlockParser#visit(String, ByLineSource)
+ * @see BlockParser#visit(String,org.apache.maven.doxia.util.ByLineSource)
*/
public final Block visit( final String line, final ByLineSource source )
throws ParseException
Modified:
maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/HRuleBlockParser.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/HRuleBlockParser.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/parser/HRuleBlockParser.java
(original)
+++
maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/HRuleBlockParser.java
Sat Mar 17 22:08:21 2007
@@ -22,7 +22,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.maven.doxia.module.common.ByLineSource;
+import org.apache.maven.doxia.util.ByLineSource;
import org.apache.maven.doxia.parser.ParseException;
Modified:
maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ParagraphBlockParser.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/ParagraphBlockParser.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/parser/ParagraphBlockParser.java
(original)
+++
maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ParagraphBlockParser.java
Sat Mar 17 22:08:21 2007
@@ -25,7 +25,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.maven.doxia.module.common.ByLineSource;
+import org.apache.maven.doxia.util.ByLineSource;
import org.apache.maven.doxia.parser.ParseException;
Modified:
maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/SectionBlockParser.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/SectionBlockParser.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/parser/SectionBlockParser.java
(original)
+++
maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/SectionBlockParser.java
Sat Mar 17 22:08:21 2007
@@ -23,7 +23,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.maven.doxia.module.common.ByLineSource;
+import org.apache.maven.doxia.util.ByLineSource;
import org.apache.maven.doxia.parser.ParseException;
Modified:
maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableBlockParser.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/TableBlockParser.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/parser/TableBlockParser.java
(original)
+++
maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableBlockParser.java
Sat Mar 17 22:08:21 2007
@@ -24,7 +24,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.maven.doxia.module.common.ByLineSource;
+import org.apache.maven.doxia.util.ByLineSource;
import org.apache.maven.doxia.parser.ParseException;
Modified:
maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/common/ByLineReaderSourceTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/common/ByLineReaderSourceTest.java?view=diff&rev=519552&r1=519551&r2=519552
==============================================================================
---
maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/common/ByLineReaderSourceTest.java
(original)
+++
maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/common/ByLineReaderSourceTest.java
Sat Mar 17 22:08:21 2007
@@ -22,12 +22,13 @@
import java.io.StringReader;
import org.apache.maven.doxia.parser.ParseException;
+import org.apache.maven.doxia.util.ByLineReaderSource;
import junit.framework.TestCase;
/**
- * Unit test for [EMAIL PROTECTED]
org.apache.maven.doxia.module.common.ByLineReaderSource}.
+ * Unit test for [EMAIL PROTECTED]
org.apache.maven.doxia.util.ByLineReaderSource}.
*
* @author Juan F. Codagnone
* @since Nov 1, 2005
Modified:
maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/ListTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/ListTest.java?view=diff&rev=519552&r1=519551&r2=519552
==============================================================================
---
maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/ListTest.java
(original)
+++
maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/ListTest.java
Sat Mar 17 22:08:21 2007
@@ -21,8 +21,8 @@
import java.io.StringReader;
-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.parser.ParseException;
import org.apache.maven.doxia.sink.Sink;
Modified:
maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/ParagraphTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/ParagraphTest.java?view=diff&rev=519552&r1=519551&r2=519552
==============================================================================
---
maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/ParagraphTest.java
(original)
+++
maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/ParagraphTest.java
Sat Mar 17 22:08:21 2007
@@ -22,7 +22,7 @@
import java.io.StringReader;
import java.util.Arrays;
-import org.apache.maven.doxia.module.common.ByLineReaderSource;
+import org.apache.maven.doxia.util.ByLineReaderSource;
import org.apache.maven.doxia.parser.ParseException;
Modified:
maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/SectionTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/SectionTest.java?view=diff&rev=519552&r1=519551&r2=519552
==============================================================================
---
maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/SectionTest.java
(original)
+++
maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/SectionTest.java
Sat Mar 17 22:08:21 2007
@@ -22,7 +22,7 @@
import java.io.StringReader;
import java.util.Arrays;
-import org.apache.maven.doxia.module.common.ByLineReaderSource;
+import org.apache.maven.doxia.util.ByLineReaderSource;
import org.apache.maven.doxia.parser.ParseException;
Modified:
maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/TableTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/TableTest.java?view=diff&rev=519552&r1=519551&r2=519552
==============================================================================
---
maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/TableTest.java
(original)
+++
maven/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/TableTest.java
Sat Mar 17 22:08:21 2007
@@ -21,8 +21,8 @@
import java.io.StringReader;
-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.parser.ParseException;
