svn commit: r391970 - in /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site: AbstractSiteMojo.java AbstractSiteRenderingMojo.java

[brett]

Author: brett
Date: Thu Apr  6 04:48:58 2006
New Revision: 391970

URL: http://svn.apache.org/viewcvs?rev=391970&view=rev
Log:
[MSITE-91] use siteDirectory to resolve site descriptor
Submitted by: Johann Reyes

Modified:
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java

Modified: 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
URL: 
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java?rev=391970&r1=391969&r2=391970&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
 Thu Apr  6 04:48:58 2006
@@ -57,6 +57,14 @@
     protected I18N i18n;
 
     /**
+     * Directory containing source for apt, fml and xdoc docs.
+     *
+     * @parameter expression="${basedir}/src/site"
+     * @required
+     */
+    protected File siteDirectory;
+
+    /**
      * Init the <code>localesList</code> variable.
      * <p>If <code>locales</code> variable is available, the first valid token 
will be the <code>defaultLocale</code>
      * for this instance of the Java Virtual Machine.</p>
@@ -178,13 +186,10 @@
      */
     protected File getSiteDescriptorFile( File basedir, Locale locale )
     {
-        // TODO: get proper siteDirectory from site configuration of the 
project this relates to
-
-        File siteDescriptor = new File( basedir, "src/site/site_" + 
locale.getLanguage() + ".xml" );
-
+        File siteDescriptor = new File( siteDirectory, "site_" + 
locale.getLanguage() + ".xml" );
         if ( !siteDescriptor.exists() )
         {
-            siteDescriptor = new File( basedir, "src/site/site.xml" );
+            siteDescriptor = new File( siteDirectory, "site.xml" );
         }
         return siteDescriptor;
     }

Modified: 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
URL: 
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java?rev=391970&r1=391969&r2=391970&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
 Thu Apr  6 04:48:58 2006
@@ -71,15 +71,6 @@
 public abstract class AbstractSiteRenderingMojo
     extends AbstractSiteMojo
 {
-
-    /**
-     * Directory containing source for apt, fml and xdoc docs.
-     *
-     * @parameter expression="${basedir}/src/site"
-     * @required
-     */
-    protected File siteDirectory;
-
     /**
      * module type exclusion mappings
      * ex: fml -> **\/*-m1.fml  (excludes -m1.fml files)