[DOXIA-511] removed deprecated o.a.m.doxia.module.site package
git-svn-id: https://svn.apache.org/repos/asf/maven/doxia/doxia/trunk@1726395 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/module/site/AbstractSiteModule.java b/doxia-core/src/main/java/org/apache/maven/doxia/module/site/AbstractSiteModule.java
deleted file mode 100644
index 23a4f16..0000000
--- a/doxia-core/src/main/java/org/apache/maven/doxia/module/site/AbstractSiteModule.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.apache.maven.doxia.module.site;
-
-/*
- * 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.
- */
-
-/**
- * An abstract base class that implements the SiteModule interface.
- *
- * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
- * @version $Id$
- * @since 1.0
- * @deprecated replaced by AbstractParserModule
- */
-public abstract class AbstractSiteModule
- implements SiteModule
-{
- /** The source directory. */
- private final String sourceDirectory;
-
- /** The default file extension. */
- private final String extension;
-
- /** The default file extension. */
- private final String parserId;
-
- /**
- * Constructor with null.
- */
- public AbstractSiteModule()
- {
- this( null, null, null );
- }
-
- /**
- * @param sourceDirectory not null
- * @param extension not null
- * @param parserId not null
- * @since 1.1.1
- */
- protected AbstractSiteModule( String sourceDirectory, String extension, String parserId )
- {
- super();
- this.sourceDirectory = sourceDirectory;
- this.extension = extension;
- this.parserId = parserId;
- }
-
- /** {@inheritDoc} */
- public String getSourceDirectory()
- {
- return sourceDirectory;
- }
-
- /** {@inheritDoc} */
- public String getExtension()
- {
- return extension;
- }
-
- /** {@inheritDoc} */
- public String getParserId()
- {
- return parserId;
- }
-}
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/module/site/SiteModule.java b/doxia-core/src/main/java/org/apache/maven/doxia/module/site/SiteModule.java
deleted file mode 100644
index ea5f3c1..0000000
--- a/doxia-core/src/main/java/org/apache/maven/doxia/module/site/SiteModule.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.apache.maven.doxia.module.site;
-
-/*
- * 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.
- */
-
-/**
- * Provides definitions for a Doxia module. This is used by the doxia site tools.
- *
- * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
- * @version $Id$
- * @since 1.0
- * @deprecated use ParserModule
- * @see org.apache.maven.doxia.parser.module.ParserModule
- */
-public interface SiteModule
-{
- /** The Plexus lookup role. */
- String ROLE = SiteModule.class.getName();
-
- /**
- * Returns the directory that contains source files for a given module.
- *
- * @return The source directory.
- */
- String getSourceDirectory();
-
- /**
- * Returns the default file extension for a given module.
- *
- * @return The default file extension.
- */
- String getExtension();
-
- /**
- * Returns the parser id for a given module.
- *
- * @return The parser id.
- */
- String getParserId();
-}
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/DefaultSiteModuleManager.java b/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/DefaultSiteModuleManager.java
deleted file mode 100644
index 35442a2..0000000
--- a/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/DefaultSiteModuleManager.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.apache.maven.doxia.module.site.manager;
-
-/*
- * 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.util.Collection;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.apache.maven.doxia.module.site.SiteModule;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
-
-/**
- * Simple implementation of the SiteModuleManager interface.
- *
- * @author Jason van Zyl
- * @version $Id$
- * @since 1.0
- * @deprecated replaced by DefaultParserModuleManager
- */
-@Component( role = SiteModuleManager.class )
-public class DefaultSiteModuleManager
- implements SiteModuleManager
-{
- @Requirement( role = SiteModule.class )
- private Map<String, SiteModule> siteModules;
-
- private Collection<SiteModule> siteModulesValues;
-
- /** {@inheritDoc} */
- public Collection<SiteModule> getSiteModules()
- {
- if ( siteModulesValues == null )
- {
- Map<Class<?>, SiteModule> siteModulesTmp = new LinkedHashMap<Class<?>, SiteModule>();
- for ( SiteModule module : siteModules.values() )
- {
- siteModulesTmp.put( module.getClass(), module );
- }
- siteModulesValues = siteModulesTmp.values();
- }
-
- return siteModulesValues;
- }
-
- /** {@inheritDoc} */
- public SiteModule getSiteModule( String id )
- throws SiteModuleNotFoundException
- {
- SiteModule siteModule = siteModules.get( id );
-
- if ( siteModule == null )
- {
- throw new SiteModuleNotFoundException( "Cannot find site module id = " + id );
- }
-
- return siteModule;
- }
-}
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/SiteModuleManager.java b/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/SiteModuleManager.java
deleted file mode 100644
index 11570b4..0000000
--- a/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/SiteModuleManager.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.apache.maven.doxia.module.site.manager;
-
-/*
- * 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 org.apache.maven.doxia.module.site.SiteModule;
-
-import java.util.Collection;
-
-/**
- * Handles SiteModule lookups.
- *
- * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
- * @version $Id$
- * @since 1.0
- * @deprecated use ParserModuleManager
- * @see org.apache.maven.doxia.parser.module.ParserModuleManager
- */
-public interface SiteModuleManager
-{
- /** The Plexus lookup role. */
- String ROLE = SiteModuleManager.class.getName();
-
- /**
- * Returns a collection of SiteModules.
- *
- * @return The SiteModules.
- */
- Collection<SiteModule> getSiteModules();
-
- /**
- * Returns the SiteModule that corresponds to the given id.
- *
- * @param id The identifier.
- * @return The corresponding SiteModule.
- * @throws org.apache.maven.doxia.module.site.manager.SiteModuleNotFoundException if no SiteModule could be found
- * for the given id.
- */
- SiteModule getSiteModule( String id )
- throws SiteModuleNotFoundException;
-}
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/SiteModuleNotFoundException.java b/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/SiteModuleNotFoundException.java
deleted file mode 100644
index 6e5df2a..0000000
--- a/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/SiteModuleNotFoundException.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.apache.maven.doxia.module.site.manager;
-
-/*
- * 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.
- */
-
-/**
- * Encapsulate a Doxia exception that indicates that a SiteModule
- * does not exist or could not be found.
- *
- * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
- * @version $Id$
- * @since 1.0
- * @deprecated
- */
-public class SiteModuleNotFoundException
- extends Exception
-{
- /** serialVersionUID */
- static final long serialVersionUID = 295967936746221567L;
-
- /**
- * Construct a new SiteModuleNotFoundException with the
- * specified detail message.
- *
- * @param message The detailed message.
- * This can later be retrieved by the Throwable.getMessage() method.
- */
- public SiteModuleNotFoundException( String message )
- {
- super( message );
- }
-
- /**
- * Constructs a new SiteModuleNotFoundException with the specified cause.
- * The error message is (cause == null ? null : cause.toString() ).
- *
- * @param cause the cause. This can be retrieved later by the
- * Throwable.getCause() method. (A null value is permitted, and indicates
- * that the cause is nonexistent or unknown.)
- */
- public SiteModuleNotFoundException( Throwable cause )
- {
- super( cause );
- }
-
- /**
- * Construct a new SiteModuleNotFoundException with the specified
- * detail message and cause.
- *
- * @param message The detailed message.
- * This can later be retrieved by the Throwable.getMessage() method.
- * @param cause The cause. This can be retrieved later by the
- * Throwable.getCause() method. (A null value is permitted, and indicates
- * that the cause is nonexistent or unknown.)
- */
- public SiteModuleNotFoundException( String message, Throwable cause )
- {
- super( message, cause );
- }
-}
diff --git a/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSiteModule.java b/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSiteModule.java
deleted file mode 100644
index 043344a..0000000
--- a/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSiteModule.java
+++ /dev/null
@@ -1,44 +0,0 @@
-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 org.apache.maven.doxia.module.site.AbstractSiteModule;
-import org.apache.maven.doxia.module.site.SiteModule;
-import org.codehaus.plexus.component.annotations.Component;
-
-/**
- * <p>AptSiteModule class.</p>
- *
- * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
- * @version $Id$
- * @since 1.0
- */
-@Component( role = SiteModule.class, hint = "apt" )
-public class AptSiteModule
- extends AbstractSiteModule
-{
- /**
- * Default constructor.
- */
- public AptSiteModule()
- {
- super( "apt", "apt", "apt" );
- }
-}
diff --git a/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSiteModule.java b/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSiteModule.java
deleted file mode 100644
index 4a058f3..0000000
--- a/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSiteModule.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.apache.maven.doxia.module.confluence;
-
-/*
- * 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 org.apache.maven.doxia.module.site.AbstractSiteModule;
-import org.apache.maven.doxia.module.site.SiteModule;
-import org.codehaus.plexus.component.annotations.Component;
-
-/**
- * <p>ConfluenceSiteModule class.</p>
- *
- * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
- * @version $Id$
- * @since 1.0
- */
-@Component( role = SiteModule.class, hint = "confluence" )
-public class ConfluenceSiteModule
- extends AbstractSiteModule
-{
- /**
- * Default constructor.
- */
- public ConfluenceSiteModule()
- {
- super( "confluence", "confluence", "confluence" );
- }
-}
diff --git a/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSiteModule.java b/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSiteModule.java
deleted file mode 100644
index 6276dba..0000000
--- a/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSiteModule.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.apache.maven.doxia.module.docbook;
-
-/*
- * 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 org.apache.maven.doxia.module.site.AbstractSiteModule;
-import org.apache.maven.doxia.module.site.SiteModule;
-import org.codehaus.plexus.component.annotations.Component;
-
-/**
- * <p>DocBookSiteModule class.</p>
- *
- * @author <a href="mailto:evenisse@codehaus.org">Emmanuel Venisse</a>
- * @version $Id$
- * @since 1.0
- */
-@Component( role = SiteModule.class, hint = "docbook" )
-public class DocBookSiteModule
- extends AbstractSiteModule
-{
- /**
- * Default constructor.
- */
- public DocBookSiteModule()
- {
- super( "docbook", "xml", "docbook" );
- }
-}
diff --git a/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlSiteModule.java b/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlSiteModule.java
deleted file mode 100644
index cf427e2..0000000
--- a/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlSiteModule.java
+++ /dev/null
@@ -1,44 +0,0 @@
-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 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 org.apache.maven.doxia.module.site.AbstractSiteModule;
-import org.apache.maven.doxia.module.site.SiteModule;
-import org.codehaus.plexus.component.annotations.Component;
-
-/**
- * <p>FmlSiteModule class.</p>
- *
- * @author <a href="mailto:evenisse@codehaus.org">Emmanuel Venisse</a>
- * @version $Id$
- * @since 1.0
- */
-@Component( role = SiteModule.class, hint = "fml" )
-public class FmlSiteModule
- extends AbstractSiteModule
-{
- /**
- * Default constructor.
- */
- public FmlSiteModule()
- {
- super( "fml", "fml", "fml" );
- }
-}
diff --git a/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownSiteModule.java b/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownSiteModule.java
deleted file mode 100644
index 77366e1..0000000
--- a/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownSiteModule.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.apache.maven.doxia.module.markdown;
-
-/*
- * 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 org.apache.maven.doxia.module.site.AbstractSiteModule;
-import org.apache.maven.doxia.module.site.SiteModule;
-import org.codehaus.plexus.component.annotations.Component;
-
-/**
- * {@link org.apache.maven.doxia.module.site.SiteModule} for Markdown.
- *
- * @author Julien Nicoulaud <julien.nicoulaud@gmail.com>
- * @since 1.3
- */
-@Component( role = SiteModule.class, hint = "markdown" )
-public class MarkdownSiteModule
- extends AbstractSiteModule
-{
-
- /**
- * The source directory for Markdown files.
- */
- public static final String SOURCE_DIRECTORY = "markdown";
-
- /**
- * The extension for Markdown files.
- */
- public static final String FILE_EXTENSION = "md";
-
- /**
- * Build a new instance of {@link MarkdownSiteModule}.
- */
- public MarkdownSiteModule()
- {
- super( SOURCE_DIRECTORY, FILE_EXTENSION, MarkdownParser.ROLE_HINT );
- }
-}
diff --git a/doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java b/doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java
index 8216c65..3ef1f20 100644
--- a/doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java
+++ b/doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java
@@ -70,7 +70,7 @@
@Override
protected String outputExtension()
{
- return MarkdownSiteModule.FILE_EXTENSION;
+ return MarkdownParserModule.FILE_EXTENSION;
}
/**
diff --git a/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSiteModule.java b/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSiteModule.java
deleted file mode 100644
index db3c073..0000000
--- a/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSiteModule.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.apache.maven.doxia.module.twiki;
-
-/*
- * 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 org.apache.maven.doxia.module.site.AbstractSiteModule;
-import org.apache.maven.doxia.module.site.SiteModule;
-import org.codehaus.plexus.component.annotations.Component;
-
-/**
- * <p>TWikiSiteModule class.</p>
- *
- * @author Juan F. Codagnone
- * @version $Id$
- * @since 1.0
- */
-@Component( role = SiteModule.class, hint = "twiki" )
-public class TWikiSiteModule
- extends AbstractSiteModule
-{
- /**
- * Default constructor.
- */
- public TWikiSiteModule()
- {
- super( "twiki", "twiki", "twiki" );
- }
-}
diff --git a/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSiteModule.java b/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSiteModule.java
deleted file mode 100644
index cdf88ef..0000000
--- a/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSiteModule.java
+++ /dev/null
@@ -1,44 +0,0 @@
-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 limitations
- * under the License.
- */
-
-import org.apache.maven.doxia.module.site.AbstractSiteModule;
-import org.apache.maven.doxia.module.site.SiteModule;
-import org.codehaus.plexus.component.annotations.Component;
-
-/**
- * <p>XdocSiteModule class.</p>
- *
- * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
- * @version $Id$
- * @since 1.0
- */
-@Component( role = SiteModule.class, hint = "xdoc" )
-public class XdocSiteModule
- extends AbstractSiteModule
-{
- /**
- * Default constructor.
- */
- public XdocSiteModule()
- {
- super( "xdoc", "xml", "xdoc" );
- }
-}
diff --git a/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSiteModule.java b/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSiteModule.java
deleted file mode 100644
index 94cbdaa..0000000
--- a/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSiteModule.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.apache.maven.doxia.module.xhtml;
-
-/*
- * 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 org.apache.maven.doxia.module.site.AbstractSiteModule;
-import org.apache.maven.doxia.module.site.SiteModule;
-import org.codehaus.plexus.component.annotations.Component;
-
-/**
- * <p>XhtmlSiteModule class.</p>
- *
- * @author ltheussl
- * @version $Id$
- * @since 1.0
- */
-@Component( role = SiteModule.class, hint = "xhtml" )
-public class XhtmlSiteModule
- extends AbstractSiteModule
-{
- /**
- * Default constructor.
- */
- public XhtmlSiteModule()
- {
- super( "xhtml", "xhtml", "xhtml" );
- }
-}
diff --git a/pom.xml b/pom.xml
index 79cdc2f..c546fb5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -263,10 +263,15 @@
</goals>
<configuration>
<excludes>
- <exclude>org/apache/maven/doxia/sink/render/*</exclude>
- <exclude>org/apache/maven/doxia/parser/module/*</exclude>
- <exclude>org/apache/maven/doxia/module/fo/*</exclude>
- <exclude>org/apache/maven/doxia/module/markdown/*</exclude>
+ <exclude>org/apache/maven/doxia/module/fo/FoAggregateSink</exclude>
+ <!-- DOXIA-527 -->
+ <exclude>org/apache/maven/doxia/parser/module/*Module</exclude>
+ <!-- DOXIA-492 -->
+ <exclude>org/apache/maven/doxia/module/markdown/MarkdownParser</exclude>
+ <!-- DOXIA-511 -->
+ <exclude>org/apache/maven/doxia/module/site</exclude>
+ <exclude>org/apache/maven/doxia/module/site/**</exclude>
+ <exclude>org/apache/maven/doxia/module/*/*SiteModule</exclude>
</excludes>
</configuration>
</execution>
