Author: evenisse
Date: Tue May 31 17:24:37 2005
New Revision: 179320
URL: http://svn.apache.org/viewcvs?rev=179320&view=rev
Log:
o Fix copy of resources directory for exclude all "default" files
o Fix xhtml for conformance with standard
Modified:
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
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=179320&r1=179319&r2=179320&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
Tue May 31 17:24:37 2005
@@ -26,6 +26,7 @@
import org.codehaus.plexus.siterenderer.Renderer;
import org.codehaus.plexus.siterenderer.RendererException;
import org.codehaus.plexus.siterenderer.sink.SiteRendererSink;
+import org.codehaus.plexus.util.DirectoryScanner;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringInputStream;
@@ -39,6 +40,7 @@
import java.io.InputStreamReader;
import java.io.LineNumberReader;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -60,6 +62,24 @@
private static final String DEFAULT_TEMPLATE = RESOURCE_DIR +
"/maven-site.vm";
+ private static final String[] DEFAULT_EXCLUDES = {// Miscellaneous typical
temporary files
+ "**/*~", "**/#*#", "**/.#*", "**/%*%", "**/._*",
+
+ // CVS
+ "**/CVS", "**/CVS/**", "**/.cvsignore",
+
+ // SCCS
+ "**/SCCS", "**/SCCS/**",
+
+ // Visual SourceSafe
+ "**/vssver.scc",
+
+ // Subversion
+ "**/.svn", "**/.svn/**",
+
+ // Mac
+ "**/.DS_Store" };
+
/**
* @parameter expression="${basedir}/src/site"
* @required
@@ -136,8 +156,8 @@
public void execute()
throws MojoExecutionException
{
- siteRenderer.setTemplateClassLoader( DoxiaMojo.class.getClassLoader()
);
-
+ siteRenderer.setTemplateClassLoader( DoxiaMojo.class.getClassLoader()
);
+
try
{
categorizeReports();
@@ -213,9 +233,9 @@
{
getLog().warn( "DEPRECATED: the css and images directories are
deprecated, please use resources" );
- FileUtils.copyDirectory( cssDirectory, new File(
outputDirectory, "css" ) );
+ copyDirectory( cssDirectory, new File( outputDirectory, "css"
) );
- FileUtils.copyDirectory( imagesDirectory, new File(
outputDirectory, "images" ) );
+ copyDirectory( imagesDirectory, new File( outputDirectory,
"images" ) );
}
// Generate static site
@@ -227,9 +247,9 @@
// Copy site resources
if ( resourcesDirectory != null )
{
- FileUtils.copyDirectory( resourcesDirectory, new File(
outputDirectory ) );
+ copyDirectory( resourcesDirectory, new File( outputDirectory )
);
}
-
+
copyResources( outputDirectory );
}
catch ( MavenReportException e )
@@ -537,7 +557,8 @@
if ( is == null )
{
- throw new IOException( "The resource " + line + " doesn't
exists in " + DEFAULT_TEMPLATE + " template." );
+ throw new IOException( "The resource " + line + " doesn't
exists in " + DEFAULT_TEMPLATE
+ + " template." );
}
File outputFile = new File( outputDirectory, line );
@@ -562,5 +583,34 @@
throws Exception
{
return DoxiaMojo.class.getClassLoader().getResourceAsStream( name );
+ }
+
+ private void copyDirectory( File source, File destination )
+ throws IOException
+ {
+ DirectoryScanner scanner = new DirectoryScanner();
+
+ String[] includedResources = { "**/**" };
+
+ scanner.setIncludes( includedResources );
+
+ scanner.addDefaultExcludes();
+
+ scanner.setBasedir( source );
+
+ scanner.scan();
+
+ List includedFiles = Arrays.asList( scanner.getIncludedFiles() );
+
+ for ( Iterator j = includedFiles.iterator(); j.hasNext(); )
+ {
+ String name = (String) j.next();
+
+ File sourceFile = new File( source, name );
+
+ File destinationFile = new File( destination, name );
+
+ FileUtils.copyFile( sourceFile, destinationFile );
+ }
}
}
Modified:
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm?rev=179320&r1=179319&r2=179320&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
(original)
+++
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
Tue May 31 17:24:37 2005
@@ -32,7 +32,7 @@
<div id="navcolumn">
$mainMenu
<a href="http://maven.apache.org/"; title="Built by Maven"
id="poweredBy">
- <img alt="Built by Maven"
src="$relativePath/images/logos/maven-feather.png"></img>
+ <img alt="Built by Maven"
src="$relativePath/images/logos/maven-feather.png" />
</a>
</div>
</div>
@@ -42,12 +42,12 @@
</div>
</div>
<div class="clear">
- <hr/>
+ <hr />
</div>
<div id="footer">
<div class="xright">© 2002-2005, Apache Software Foundation</div>
<div class="clear">
- <hr/>
+ <hr />
</div>
</div>
</body>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
