Author: vsiveton
Date: Sat Aug  4 05:20:40 2007
New Revision: 562704

URL: http://svn.apache.org/viewvc?view=rev&rev=562704
Log:
DOXIA-56: clean up doxia api and code

o renamed org.apache.maven.doxia.site.module to 
org.apache.maven.doxia.module.site: site is module specific
o fixed also javadoc

Added:
    
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/
    
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/
    
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/AbstractSiteModule.java
      - copied, changed from r562681, 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/site/module/AbstractSiteModule.java
    
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/SiteModule.java
      - copied, changed from r562681, 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/site/module/SiteModule.java
    
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/
      - copied from r562681, 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/site/module/manager/
Removed:
    
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/site/
Modified:
    
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/DefaultSiteModuleManager.java
    
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/SiteModuleManager.java
    
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/SiteModuleNotFoundException.java
    
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSiteModule.java
    
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSiteModule.java
    
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSiteModule.java
    
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlSiteModule.java
    
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSiteModule.java
    
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSiteModule.java

Copied: 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/AbstractSiteModule.java
 (from r562681, 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/site/module/AbstractSiteModule.java)
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/AbstractSiteModule.java?view=diff&rev=562704&p1=maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/site/module/AbstractSiteModule.java&r1=562681&p2=maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/AbstractSiteModule.java&r2=562704
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/site/module/AbstractSiteModule.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/AbstractSiteModule.java
 Sat Aug  4 05:20:40 2007
@@ -1,4 +1,4 @@
-package org.apache.maven.doxia.site.module;
+package org.apache.maven.doxia.module.site;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,7 +23,8 @@
  * An abstract base class that implements the SiteModule interface.
  *
  * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id:AbstractSiteModule.java 348605 2005-11-24 12:02:44 +1100 (Thu, 
24 Nov 2005) brett $
+ * @version $Id$
+ * @since 1.0
  * @plexus.component
  */
 public abstract class AbstractSiteModule

Copied: 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/SiteModule.java
 (from r562681, 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/site/module/SiteModule.java)
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/SiteModule.java?view=diff&rev=562704&p1=maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/site/module/SiteModule.java&r1=562681&p2=maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/SiteModule.java&r2=562704
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/site/module/SiteModule.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/SiteModule.java
 Sat Aug  4 05:20:40 2007
@@ -1,4 +1,4 @@
-package org.apache.maven.doxia.site.module;
+package org.apache.maven.doxia.module.site;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,7 +23,8 @@
  * Provides definitions for a Doxia module. This is used by the doxia site 
tools.
  *
  * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id:SiteModule.java 348605 2005-11-24 12:02:44 +1100 (Thu, 24 Nov 
2005) brett $
+ * @version $Id$
+ * @since 1.0
  */
 public interface SiteModule
 {

Modified: 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/DefaultSiteModuleManager.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/DefaultSiteModuleManager.java?view=diff&rev=562704&r1=562681&r2=562704
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/DefaultSiteModuleManager.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/DefaultSiteModuleManager.java
 Sat Aug  4 05:20:40 2007
@@ -1,4 +1,4 @@
-package org.apache.maven.doxia.site.module.manager;
+package org.apache.maven.doxia.module.site.manager;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,7 @@
  * under the License.
  */
 
-import org.apache.maven.doxia.site.module.SiteModule;
+import org.apache.maven.doxia.module.site.SiteModule;
 
 import java.util.Collection;
 import java.util.Map;
@@ -28,7 +28,8 @@
  * Simple implementation of the SiteModuleManager interface.
  *
  * @author Jason van Zyl
- * @version $Id:DefaultSiteModuleManager.java 348605 2005-11-24 12:02:44 +1100 
(Thu, 24 Nov 2005) brett $
+ * @version $Id$
+ * @since 1.0
  * @plexus.component
  */
 public class DefaultSiteModuleManager

Modified: 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/SiteModuleManager.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/SiteModuleManager.java?view=diff&rev=562704&r1=562681&r2=562704
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/SiteModuleManager.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/SiteModuleManager.java
 Sat Aug  4 05:20:40 2007
@@ -1,4 +1,4 @@
-package org.apache.maven.doxia.site.module.manager;
+package org.apache.maven.doxia.module.site.manager;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,7 @@
  * under the License.
  */
 
-import org.apache.maven.doxia.site.module.SiteModule;
+import org.apache.maven.doxia.module.site.SiteModule;
 
 import java.util.Collection;
 
@@ -27,7 +27,8 @@
  * Handles SiteModule lookups.
  *
  * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id:SiteModuleManager.java 348605 2005-11-24 12:02:44 +1100 (Thu, 
24 Nov 2005) brett $
+ * @version $Id$
+ * @since 1.0
  */
 public interface SiteModuleManager
 {

Modified: 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/SiteModuleNotFoundException.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/SiteModuleNotFoundException.java?view=diff&rev=562704&r1=562681&r2=562704
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/SiteModuleNotFoundException.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/SiteModuleNotFoundException.java
 Sat Aug  4 05:20:40 2007
@@ -1,4 +1,4 @@
-package org.apache.maven.doxia.site.module.manager;
+package org.apache.maven.doxia.module.site.manager;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,7 +24,8 @@
  * does not exist or could not be found.
  *
  * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id:SiteModuleNotFoundException.java 348605 2005-11-24 12:02:44 
+1100 (Thu, 24 Nov 2005) brett $
+ * @version $Id$
+ * @since 1.0
  */
 public class SiteModuleNotFoundException
     extends Exception

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSiteModule.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSiteModule.java?view=diff&rev=562704&r1=562703&r2=562704
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSiteModule.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSiteModule.java
 Sat Aug  4 05:20:40 2007
@@ -19,11 +19,12 @@
  * under the License.
  */
 
-import org.apache.maven.doxia.site.module.AbstractSiteModule;
+import org.apache.maven.doxia.module.site.AbstractSiteModule;
 
 /**
  * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id:AptSiteModule.java 348605 2005-11-24 12:02:44 +1100 (Thu, 24 
Nov 2005) brett $
+ * @version $Id$
+ * @since 1.0
  * @plexus.component role="org.apache.maven.doxia.site.module.SiteModule" 
role-hint="apt"
  */
 public class AptSiteModule

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSiteModule.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSiteModule.java?view=diff&rev=562704&r1=562703&r2=562704
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSiteModule.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSiteModule.java
 Sat Aug  4 05:20:40 2007
@@ -19,11 +19,12 @@
  * under the License.
  */
 
-import org.apache.maven.doxia.site.module.AbstractSiteModule;
+import org.apache.maven.doxia.module.site.AbstractSiteModule;
 
 /**
  * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id:AptSiteModule.java 348605 2005-11-24 12:02:44 +1100 (Thu, 24 
Nov 2005) brett $
+ * @version $Id$
+ * @since 1.0
  * @plexus.component role="org.apache.maven.doxia.site.module.SiteModule"
  * role-hint="confluence"
  */

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSiteModule.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSiteModule.java?view=diff&rev=562704&r1=562703&r2=562704
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSiteModule.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSiteModule.java
 Sat Aug  4 05:20:40 2007
@@ -19,11 +19,12 @@
  * under the License.
  */
 
-import org.apache.maven.doxia.site.module.AbstractSiteModule;
+import org.apache.maven.doxia.module.site.AbstractSiteModule;
 
 /**
  * @author <a href="mailto:[EMAIL PROTECTED]">Emmanuel Venisse</a>
- * @version $Id:DocBookSiteModule.java 348605 2005-11-24 12:02:44 +1100 (Thu, 
24 Nov 2005) brett $
+ * @version $Id$
+ * @since 1.0
  * @plexus.component role="org.apache.maven.doxia.site.module.SiteModule" 
role-hint="doc-book"
  */
 public class DocBookSiteModule

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlSiteModule.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlSiteModule.java?view=diff&rev=562704&r1=562703&r2=562704
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlSiteModule.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlSiteModule.java
 Sat Aug  4 05:20:40 2007
@@ -19,11 +19,12 @@
  * under the License.
  */
 
-import org.apache.maven.doxia.site.module.AbstractSiteModule;
+import org.apache.maven.doxia.module.site.AbstractSiteModule;
 
 /**
  * @author <a href="mailto:[EMAIL PROTECTED]">Emmanuel Venisse</a>
- * @version $Id:FmlSiteModule.java 348605 2005-11-24 12:02:44 +1100 (Thu, 24 
Nov 2005) brett $
+ * @version $Id$
+ * @since 1.0
  * @plexus.component role="org.apache.maven.doxia.site.module.SiteModule" 
role-hint="fml"
  */
 public class FmlSiteModule

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSiteModule.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSiteModule.java?view=diff&rev=562704&r1=562703&r2=562704
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSiteModule.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSiteModule.java
 Sat Aug  4 05:20:40 2007
@@ -19,15 +19,16 @@
  * under the License.
  */
 
-import org.apache.maven.doxia.site.module.SiteModule;
+import org.apache.maven.doxia.module.site.SiteModule;
 
 /**
- * [EMAIL PROTECTED] org.apache.maven.doxia.site.module.SiteModule} 
implementation for
+ * [EMAIL PROTECTED] org.apache.maven.doxia.module.site.SiteModule} 
implementation for
  * the twiki file format.
  *
  * @author Juan F. Codagnone
+ * @version $Id$
+ * @since 1.0
  * @plexus.component role="org.apache.maven.doxia.site.module.SiteModule" 
role-hint="twiki"
- * @since Oct 31, 2005
  */
 public final class TWikiSiteModule implements SiteModule
 {

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSiteModule.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSiteModule.java?view=diff&rev=562704&r1=562703&r2=562704
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSiteModule.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSiteModule.java
 Sat Aug  4 05:20:40 2007
@@ -19,11 +19,12 @@
  * under the License.
  */
 
-import org.apache.maven.doxia.site.module.AbstractSiteModule;
+import org.apache.maven.doxia.module.site.AbstractSiteModule;
 
 /**
  * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id:XdocSiteModule.java 348605 2005-11-24 12:02:44 +1100 (Thu, 24 
Nov 2005) brett $
+ * @version $Id$
+ * @since 1.0
  * @plexus.component role="org.apache.maven.doxia.site.module.SiteModule" 
role-hint="xdoc"
  */
 public class XdocSiteModule


Reply via email to