You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by vs...@apache.org on 2005/07/13 14:20:44 UTC

svn commit: r216145 - in /maven/components/trunk/maven-plugins/maven-site-plugin: pom.xml src/main/java/org/apache/maven/doxia/DoxiaMojo.java

Author: vsiveton
Date: Wed Jul 13 05:20:40 2005
New Revision: 216145

URL: http://svn.apache.org/viewcvs?rev=216145&view=rev
Log:
Take care about generatedSiteDirectory var

Modified:
    maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml
    maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java

Modified: maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml?rev=216145&r1=216144&r2=216145&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml Wed Jul 13 05:20:40 2005
@@ -1,3 +1,23 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+ -->
+
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
@@ -41,4 +61,16 @@
       <version>1.0-alpha-4</version>
     </dependency>
   </dependencies>
+  <developers>
+    <developer>
+      <id>vsiveton</id>
+      <name>Vincent Siveton</name>
+      <email>vsiveton@apache.org</email>
+      <organization>Apache Software Foundation</organization>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+      <timezone>-5</timezone>
+    </developer>
+  </developers>
 </project>

Modified: maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java?rev=216145&r1=216144&r2=216145&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java Wed Jul 13 05:20:40 2005
@@ -60,9 +60,10 @@
 import java.util.StringTokenizer;
 
 /**
- * Generate the project site.
+ * Generates the project site.
  *
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
+ * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
  * @version $Id$
  * @goal site
  * @requiresDependencyResolution test
@@ -280,6 +281,14 @@
                         throw new MojoExecutionException( "An error is occurred in project reports page generation.",
                                                           e );
                     }
+                }
+
+                // Generated Site Directory
+                File generatedSiteFile = new File( generatedSiteDirectory );
+                if ( generatedSiteFile.exists() )
+                {
+                    siteRenderer.render( generatedSiteFile, localeOutputDirectory,
+                                         getSiteDescriptor( reports, locale ), template, attributes, locale );
                 }
 
                 // Generate static site



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org