From cd4ddec0a0c14db770877eb0211327c57c0cff08 Mon Sep 17 00:00:00 2001 From: Mark Donszelmann Date: Wed, 2 Dec 2009 15:17:54 +0100 Subject: Fixed NAR-12 --- .../org/apache/maven/plugin/nar/NarResourcesMojo.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'src/main/java/org/apache/maven/plugin/nar/NarResourcesMojo.java') diff --git a/src/main/java/org/apache/maven/plugin/nar/NarResourcesMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarResourcesMojo.java index fa05acd..b730a52 100644 --- a/src/main/java/org/apache/maven/plugin/nar/NarResourcesMojo.java +++ b/src/main/java/org/apache/maven/plugin/nar/NarResourcesMojo.java @@ -20,6 +20,7 @@ package org.apache.maven.plugin.nar; */ import java.io.File; +import java.io.IOException; import java.util.Iterator; import org.apache.maven.plugin.MojoExecutionException; @@ -57,6 +58,24 @@ public class NarResourcesMojo public final void narExecute() throws MojoExecutionException, MojoFailureException { + // noarch resources + try + { + int copied = 0; + File noarchDir = new File( resourceDirectory, NarConstants.NAR_NO_ARCH ); + if ( noarchDir.exists() ) + { + File noarchDstDir = getLayout().getNoArchDirectory( getTargetDirectory() ); + getLog().debug( "Copying noarch from " + noarchDir + " to " + noarchDstDir ); + copied += NarUtil.copyDirectoryStructure( noarchDir, noarchDstDir, null, NarUtil.DEFAULT_EXCLUDES ); + } + getLog().info( "Copied " + copied + " resources" ); + } + catch ( IOException e ) + { + throw new MojoExecutionException( "NAR: Could not copy resources", e ); + } + // scan resourceDirectory for AOLs File aolDir = new File( resourceDirectory, NarConstants.NAR_AOL ); if ( aolDir.exists() ) -- cgit v1.2.3