You are viewing a plain text version of this content. The canonical link for it is here.
Posted to doxia-commits@maven.apache.org by br...@apache.org on 2005/12/20 07:04:49 UTC
svn commit: r357919 - in /maven/doxia/trunk/doxia-core/src:
main/java/org/apache/maven/doxia/ main/java/org/apache/maven/doxia/plugin/
main/java/org/apache/maven/doxia/plugin/manager/
main/java/org/apache/maven/doxia/sink/manager/ test/java/org/apache/...
Author: brett
Date: Mon Dec 19 22:04:37 2005
New Revision: 357919
URL: http://svn.apache.org/viewcvs?rev=357919&view=rev
Log:
clean up some stuff that was never used
Removed:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/plugin/AbstractPlugin.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/plugin/Plugin.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/plugin/manager/
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/manager/
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/DoxiaTest.java
Modified:
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
Modified: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/DefaultDoxia.java
URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/DefaultDoxia.java?rev=357919&r1=357918&r2=357919&view=diff
==============================================================================
--- 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 Mon Dec 19 22:04:37 2005
@@ -16,14 +16,11 @@
* limitations under the License.
*/
-import org.apache.maven.doxia.macro.manager.MacroManager;
import org.apache.maven.doxia.parser.ParseException;
import org.apache.maven.doxia.parser.Parser;
import org.apache.maven.doxia.parser.manager.ParserManager;
import org.apache.maven.doxia.parser.manager.ParserNotFoundException;
-import org.apache.maven.doxia.plugin.manager.PluginManager;
import org.apache.maven.doxia.sink.Sink;
-import org.apache.maven.doxia.sink.manager.SinkNotFoundException;
import java.io.Reader;
@@ -35,36 +32,10 @@
public class DefaultDoxia
implements Doxia
{
- // protected SinkManager sinkManager;
-
- /**
- * @plexus.requirement
- */
- protected ParserManager parserManager;
-
/**
* @plexus.requirement
*/
- protected MacroManager macroManager;
-
- /**
- * @plexus.requirement
- */
- protected PluginManager pluginManager;
-
- // ----------------------------------------------------------------------
- //
- // ----------------------------------------------------------------------
-
- public void parse( Reader source, String parserId, String sinkId )
- throws ParserNotFoundException, SinkNotFoundException, ParseException
- {
- // Parser parser = parserManager.getParser( parserId );
-
- // Sink sink = sinkManager.getSink( sinkId );
-
- // parser.parse( source, sink );
- }
+ private ParserManager parserManager;
// ----------------------------------------------------------------------
// This remains because the sinks are not threadsafe which they probably
@@ -80,29 +51,4 @@
parser.parse( source, sink );
}
- // ----------------------------------------------------------------------
- // Managers:
- //
- // Not sure if access to the managers will be required but until I flesh
- // out the functionality I'm just not certain.
- // ----------------------------------------------------------------------
-
- /*
- * public SinkManager getSinkManager() { return sinkManager; }
- */
-
- public ParserManager getParserManager()
- {
- return parserManager;
- }
-
- public MacroManager getMacroManager()
- {
- return macroManager;
- }
-
- public PluginManager getPluginManager()
- {
- return pluginManager;
- }
}
Modified: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/Doxia.java
URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/Doxia.java?rev=357919&r1=357918&r2=357919&view=diff
==============================================================================
--- 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 Mon Dec 19 22:04:37 2005
@@ -16,13 +16,9 @@
* limitations under the License.
*/
-import org.apache.maven.doxia.macro.manager.MacroManager;
import org.apache.maven.doxia.parser.ParseException;
-import org.apache.maven.doxia.parser.manager.ParserManager;
import org.apache.maven.doxia.parser.manager.ParserNotFoundException;
-import org.apache.maven.doxia.plugin.manager.PluginManager;
import org.apache.maven.doxia.sink.Sink;
-import org.apache.maven.doxia.sink.manager.SinkNotFoundException;
import java.io.Reader;
@@ -34,17 +30,7 @@
{
String ROLE = Doxia.class.getName();
- void parse( Reader source, String parserId, String sinkId )
- throws ParserNotFoundException, SinkNotFoundException, ParseException;
-
void parse( Reader source, String parserId, Sink sink )
throws ParserNotFoundException, ParseException;
- // SinkManager getSinkManager();
-
- ParserManager getParserManager();
-
- MacroManager getMacroManager();
-
- PluginManager getPluginManager();
}