maven-doxia-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject 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/org/apache/maven/doxia/macro/manager/ src/main/java/o...
Date Sun, 18 Mar 2007 05:05:05 GMT
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 @@
     <dependency>
       <groupId>org.apache.maven.doxia</groupId>
       <artifactId>doxia-sink-api</artifactId>
-      <version>1.0-alpha-8</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>1.0.4</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-container-default</artifactId>
-      <version>1.0-alpha-8</version>
-      <scope>runtime</scope>
     </dependency>
+    <!--
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-component-api</artifactId>
+    </dependency>
+    -->
   </dependencies>
 </project>

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 <a href="mailto:jason@maven.org">Jason van Zyl</a>
+ * @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/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/Doxia.java?view=diff&rev=519544&r1=519543&r2=519544
==============================================================================
--- maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/Doxia.java (original)
+++ maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/Doxia.java Sat Mar 17
22:05:04 2007
@@ -26,7 +26,7 @@
 import java.io.Reader;
 
 /**
- * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
+ * @author Jason van Zyl
  * @version $Id:Doxia.java 348605 2005-11-24 12:02:44 +1100 (Thu, 24 Nov 2005) brett $
  */
 public interface Doxia

Modified: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/index/IndexingSink.java
URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/index/IndexingSink.java?view=diff&rev=519544&r1=519543&r2=519544
==============================================================================
--- maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/index/IndexingSink.java
(original)
+++ maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/index/IndexingSink.java
Sat Mar 17 22:05:04 2007
@@ -21,7 +21,7 @@
 
 import java.util.Stack;
 
-import org.apache.maven.doxia.module.HtmlTools;
+import org.apache.maven.doxia.util.HtmlTools;
 import org.apache.maven.doxia.sink.SinkAdapter;
 
 /**

Modified: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/EchoMacro.java
URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/EchoMacro.java?view=diff&rev=519544&r1=519543&r2=519544
==============================================================================
--- maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/EchoMacro.java
(original)
+++ maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/EchoMacro.java
Sat Mar 17 22:05:04 2007
@@ -24,8 +24,7 @@
 import java.util.Iterator;
 
 /**
- * @plexus.component role="org.apache.maven.doxia.macro.Macro"
- * role-hint="echo"
+ * @plexus.component role-hint="echo"
  */
 public class EchoMacro
     extends AbstractMacro

Modified: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/manager/DefaultMacroManager.java
URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/manager/DefaultMacroManager.java?view=diff&rev=519544&r1=519543&r2=519544
==============================================================================
--- maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/manager/DefaultMacroManager.java
(original)
+++ maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/manager/DefaultMacroManager.java
Sat Mar 17 22:05:04 2007
@@ -26,14 +26,12 @@
 /**
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
  * @version $Id:DefaultMacroManager.java 348605 2005-11-24 12:02:44 +1100 (Thu, 24 Nov 2005)
brett $
- * @plexus.component role="org.apache.maven.doxia.macro.manager.MacroManager"
+ * @plexus.component
  */
 public class DefaultMacroManager
     implements MacroManager
 {
-    /**
-     * @plexus.requirement role="org.apache.maven.doxia.macro.Macro"
-     */
+    /** @plexus.requirement role="org.apache.maven.doxia.macro.Macro" */
     private Map macros;
 
     public Macro getMacro( String id )

Modified: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java
URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java?view=diff&rev=519544&r1=519543&r2=519544
==============================================================================
--- maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java
(original)
+++ maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java
Sat Mar 17 22:05:04 2007
@@ -35,8 +35,7 @@
 import java.util.Map;
 
 /**
- * @plexus.component role="org.apache.maven.doxia.macro.Macro"
- * role-hint="snippet"
+ * @plexus.component role-hint="snippet"
  */
 public class SnippetMacro
     extends AbstractMacro

Modified: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/toc/TocMacro.java
URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/toc/TocMacro.java?view=diff&rev=519544&r1=519543&r2=519544
==============================================================================
--- maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/toc/TocMacro.java
(original)
+++ maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/toc/TocMacro.java
Sat Mar 17 22:05:04 2007
@@ -27,7 +27,7 @@
 import org.apache.maven.doxia.macro.AbstractMacro;
 import org.apache.maven.doxia.macro.MacroExecutionException;
 import org.apache.maven.doxia.macro.MacroRequest;
-import org.apache.maven.doxia.module.HtmlTools;
+import org.apache.maven.doxia.util.HtmlTools;
 import org.apache.maven.doxia.parser.ParseException;
 import org.apache.maven.doxia.parser.Parser;
 import org.apache.maven.doxia.sink.Sink;
@@ -63,8 +63,7 @@
  * &lt;macro name="toc" section="1" fromDepth="1" toDepth="2"/&gt;
  * </pre>
  *
- * @plexus.component role="org.apache.maven.doxia.macro.Macro"
- * role-hint="toc"
+ * @plexus.component role-hint="toc"
  *
  * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
  * @version $Id$

Modified: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java
URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java?view=diff&rev=519544&r1=519543&r2=519544
==============================================================================
--- maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java
(original)
+++ maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java
Sat Mar 17 22:05:04 2007
@@ -29,7 +29,7 @@
 import org.apache.maven.doxia.sink.Sink;
 
 /**
- * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
+ * @author Jason van Zyl
  * @version $Id:AbstractParser.java 348605 2005-11-24 12:02:44 +1100 (Thu, 24 Nov 2005) brett
$
  * @plexus.component
  */
@@ -38,14 +38,14 @@
 {
     protected boolean secondParsing = false;
 
-    /**
-     * @plexus.requirement
-     */
-    private MacroManager macroManager;
+    /** @plexus.requirement */
+    protected MacroManager macroManager;
 
     // Made public right now because of the structure of the APT parser and
     // all its inner classes.
-    public void executeMacro( String macroId, MacroRequest request, Sink sink )
+    public void executeMacro( String macroId,
+                              MacroRequest request,
+                              Sink sink )
         throws MacroExecutionException, MacroNotFoundException
     {
         Macro macro = macroManager.getMacro( macroId );

Modified: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/manager/DefaultParserManager.java
URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/manager/DefaultParserManager.java?view=diff&rev=519544&r1=519543&r2=519544
==============================================================================
--- maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/manager/DefaultParserManager.java
(original)
+++ maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/manager/DefaultParserManager.java
Sat Mar 17 22:05:04 2007
@@ -26,7 +26,7 @@
 /**
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
  * @version $Id:DefaultParserManager.java 348605 2005-11-24 12:02:44 +1100 (Thu, 24 Nov 2005)
brett $
- * @plexus.component role="org.apache.maven.doxia.parser.manager.ParserManager"
+ * @plexus.component
  */
 public class DefaultParserManager
     implements ParserManager

Modified: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/site/module/manager/DefaultSiteModuleManager.java
URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/site/module/manager/DefaultSiteModuleManager.java?view=diff&rev=519544&r1=519543&r2=519544
==============================================================================
--- maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/site/module/manager/DefaultSiteModuleManager.java
(original)
+++ maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/site/module/manager/DefaultSiteModuleManager.java
Sat Mar 17 22:05:04 2007
@@ -27,7 +27,7 @@
 /**
  * @author Jason van Zyl
  * @version $Id:DefaultSiteModuleManager.java 348605 2005-11-24 12:02:44 +1100 (Thu, 24 Nov
2005) brett $
- * @plexus.component role="org.apache.maven.doxia.site.module.manager.SiteModuleManager"
+ * @plexus.component
  */
 public class DefaultSiteModuleManager
     implements SiteModuleManager

Copied: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/ByLineReaderSource.java
(from r519326, maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/common/ByLineReaderSource.java)
URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/ByLineReaderSource.java?view=diff&rev=519544&p1=maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/common/ByLineReaderSource.java&r1=519326&p2=maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/ByLineReaderSource.java&r2=519544
==============================================================================
--- maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/common/ByLineReaderSource.java
(original)
+++ maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/ByLineReaderSource.java
Sat Mar 17 22:05:04 2007
@@ -2,7 +2,7 @@
  * Originaly from org.apache.doxia.module.apt.AptReaderSource. It was modified
  * to get unget support 
  */
-package org.apache.maven.doxia.module.common;
+package org.apache.maven.doxia.util;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -27,10 +27,10 @@
 import java.io.LineNumberReader;
 import java.io.Reader;
 
-import org.apache.maven.doxia.module.apt.AptParseException;
+import org.apache.maven.doxia.parser.ParseException;
 
 /**
- * {@link org.apache.maven.doxia.module.common.ByLineSource} default implementation
+ * {@link ByLineSource} default implementation
  */
 public class ByLineReaderSource implements ByLineSource
 {
@@ -69,7 +69,7 @@
     /**
      * @see ByLineSource#getNextLine()
      */
-    public final String getNextLine() throws AptParseException
+    public final String getNextLine() throws ParseException
     {
         if ( reader == null )
         {
@@ -99,7 +99,7 @@
         }
         catch ( IOException e )
         {
-            throw new AptParseException( e );
+            throw new ParseException( e );
         }
 
         lastLine = line;

Propchange: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/ByLineReaderSource.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/ByLineReaderSource.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Copied: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/ByLineSource.java
(from r519326, maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/common/ByLineSource.java)
URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/ByLineSource.java?view=diff&rev=519544&p1=maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/common/ByLineSource.java&r1=519326&p2=maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/ByLineSource.java&r2=519544
==============================================================================
--- maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/common/ByLineSource.java
(original)
+++ maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/ByLineSource.java
Sat Mar 17 22:05:04 2007
@@ -1,4 +1,4 @@
-package org.apache.maven.doxia.module.common;
+package org.apache.maven.doxia.util;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Propchange: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/ByLineSource.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/ByLineSource.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Copied: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
(from r519326, maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/HtmlTools.java)
URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java?view=diff&rev=519544&p1=maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/HtmlTools.java&r1=519326&p2=maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java&r2=519544
==============================================================================
--- maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/HtmlTools.java
(original)
+++ maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
Sat Mar 17 22:05:04 2007
@@ -1,4 +1,4 @@
-package org.apache.maven.doxia.module;
+package org.apache.maven.doxia.util;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Propchange: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/StringUtil.java
URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/StringUtil.java?view=diff&rev=519544&r1=519543&r2=519544
==============================================================================
--- maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/StringUtil.java
(original)
+++ maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/StringUtil.java
Sat Mar 17 22:05:04 2007
@@ -602,15 +602,4 @@
 
         return replaced.toString();
     }
-
-    /**
-     * A simple test for {@link #replaceAll}.
-     */
-    /*
-    public static final void main(String[] args) {
-    System.out.println("'" +
-               StringUtil.replaceAll(args[0], args[1], args[2]) +
-               "'");
-    }
-    */
 }

Added: maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/macro/MacroManagerTest.java
URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/macro/MacroManagerTest.java?view=auto&rev=519544
==============================================================================
--- maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/macro/MacroManagerTest.java
(added)
+++ maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/macro/MacroManagerTest.java
Sat Mar 17 22:05:04 2007
@@ -0,0 +1,17 @@
+package org.apache.maven.doxia.macro;
+
+import org.codehaus.plexus.PlexusTestCase;
+import org.apache.maven.doxia.macro.manager.MacroManager;
+
+/** @author Jason van Zyl */
+public class MacroManagerTest
+    extends PlexusTestCase
+{
+    public void testMacroManager()
+        throws Exception
+    {
+        MacroManager mm = (MacroManager) lookup( MacroManager.ROLE );
+        
+        assertNotNull( mm );
+    }
+}

Propchange: maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/macro/MacroManagerTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

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

Modified: maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/HtmlToolsTest.java
URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/HtmlToolsTest.java?view=diff&rev=519544&r1=519543&r2=519544
==============================================================================
--- maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/HtmlToolsTest.java
(original)
+++ maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/HtmlToolsTest.java
Sat Mar 17 22:05:04 2007
@@ -20,6 +20,7 @@
  */
 
 import org.codehaus.plexus.PlexusTestCase;
+import org.apache.maven.doxia.util.HtmlTools;
 
 /**
  * Test case for <code>HtmlTools</code>

Modified: maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTestCase.java
URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTestCase.java?view=diff&rev=519544&r1=519543&r2=519544
==============================================================================
--- maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTestCase.java
(original)
+++ maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTestCase.java
Sat Mar 17 22:05:04 2007
@@ -19,8 +19,7 @@
  * under the License.
  */
 
-import org.apache.maven.doxia.module.apt.AptParser;
-import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.parser.Parser;
 import org.codehaus.plexus.PlexusTestCase;
 
 import java.io.File;
@@ -46,7 +45,7 @@
     public void testApt()
         throws Exception
     {
-        AptParser parser = new AptParser();
+        Parser parser = createParser();
 
         parser.parse( getTestReader(), createSink() );
     }
@@ -57,6 +56,8 @@
 
     protected abstract String outputExtension();
 
+    protected abstract Parser createParser();
+
     protected abstract Sink createSink()
         throws Exception;
 
@@ -85,7 +86,7 @@
     protected Reader getTestReader()
         throws Exception
     {
-        InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(
"test/test.apt" );
+        InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(
"test.apt" );
 
         InputStreamReader reader = new InputStreamReader( is );
 



Mime
View raw message