Added simple test to be run with -Prun-its

39 files changed, 109 insertions, 69 deletions

diff --git a/src/main/java/org/apache/maven/plugin/nar/AbstractCompileMojo.java b/src/main/java/org/apache/maven/plugin/nar/AbstractCompileMojo.java
index d3ba643..9f182d7 100644
--- a/src/main/java/org/apache/maven/plugin/nar/AbstractCompileMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/AbstractCompileMojo.java
@@ -27,7 +27,6 @@ import org.apache.tools.ant.Project;
 
 /**
  * @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/AbstractCompileMojo.java 0ee9148b7c6a 2007/09/20 18:42:29 duns $
  */
 public abstract class AbstractCompileMojo extends AbstractDependencyMojo {
 
diff --git a/src/main/java/org/apache/maven/plugin/nar/AbstractDependencyMojo.java b/src/main/java/org/apache/maven/plugin/nar/AbstractDependencyMojo.java
index 230a960..3020938 100644
--- a/src/main/java/org/apache/maven/plugin/nar/AbstractDependencyMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/AbstractDependencyMojo.java
@@ -24,7 +24,6 @@ import org.apache.maven.plugin.MojoFailureException;
 
 /**
  * @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/AbstractDependencyMojo.java c867ab546be1 2007/07/05 21:26:30 duns $
  */
 public abstract class AbstractDependencyMojo extends AbstractNarMojo {
 
diff --git a/src/main/java/org/apache/maven/plugin/nar/AbstractNarMojo.java b/src/main/java/org/apache/maven/plugin/nar/AbstractNarMojo.java
index eecb322..066d80a 100644
--- a/src/main/java/org/apache/maven/plugin/nar/AbstractNarMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/AbstractNarMojo.java
@@ -28,7 +28,6 @@ import org.apache.maven.project.MavenProject;
 
 /**
  * @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/AbstractNarMojo.java 0ee9148b7c6a 2007/09/20 18:42:29 duns $
  */
 public abstract class AbstractNarMojo extends AbstractMojo implements NarConstants {
     
diff --git a/src/main/java/org/apache/maven/plugin/nar/AttachedNarArtifact.java b/src/main/java/org/apache/maven/plugin/nar/AttachedNarArtifact.java
index b874295..48c5f52 100644
--- a/src/main/java/org/apache/maven/plugin/nar/AttachedNarArtifact.java
+++ b/src/main/java/org/apache/maven/plugin/nar/AttachedNarArtifact.java
@@ -29,7 +29,6 @@ import org.apache.maven.artifact.versioning.VersionRange;
  * NarArtifact with its own type, classifier and artifactHandler.
  *
  * @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/AttachedNarArtifact.java 54f05023f537 2007/07/24 05:44:30 duns $
  */
 public class AttachedNarArtifact extends DefaultArtifact {
 
diff --git a/src/main/java/org/apache/maven/plugin/nar/C.java b/src/main/java/org/apache/maven/plugin/nar/C.java
index f438ba8..9a672f7 100644
--- a/src/main/java/org/apache/maven/plugin/nar/C.java
+++ b/src/main/java/org/apache/maven/plugin/nar/C.java
@@ -23,7 +23,6 @@ package org.apache.maven.plugin.nar;
  * C compiler tag
  *
  * @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/C.java 631dc18040bb 2007/07/17 14:21:11 duns $
  */
 public class C extends Compiler { 
     
diff --git a/src/main/java/org/apache/maven/plugin/nar/Compiler.java b/src/main/java/org/apache/maven/plugin/nar/Compiler.java
index f95d17b..86c3b88 100644
--- a/src/main/java/org/apache/maven/plugin/nar/Compiler.java
+++ b/src/main/java/org/apache/maven/plugin/nar/Compiler.java
@@ -43,8 +43,7 @@ import org.codehaus.plexus.util.StringUtils;
 /**
  * Abstract Compiler class
  * 
- * @author <a href="Mark.Donszelmann@slac.stanford.edu">Mark Donszelmann</a>
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/Compiler.java 0ee9148b7c6a 2007/09/20 18:42:29 duns $
+ * @author Mark Donszelmann
  */
 public abstract class Compiler {
 
diff --git a/src/main/java/org/apache/maven/plugin/nar/Cpp.java b/src/main/java/org/apache/maven/plugin/nar/Cpp.java
index 5d0310d..2926f60 100644
--- a/src/main/java/org/apache/maven/plugin/nar/Cpp.java
+++ b/src/main/java/org/apache/maven/plugin/nar/Cpp.java
@@ -22,8 +22,7 @@ package org.apache.maven.plugin.nar;
 /**
  * Cpp compiler tag
  *
- * @author <a href="Mark.Donszelmann@slac.stanford.edu">Mark Donszelmann</a>
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/Cpp.java 631dc18040bb 2007/07/17 14:21:11 duns $
+ * @author Mark Donszelmann
  */
 public class Cpp extends Compiler {
 	public Cpp() {
diff --git a/src/main/java/org/apache/maven/plugin/nar/Executable.java b/src/main/java/org/apache/maven/plugin/nar/Executable.java
index 6261268..c74b24e 100644
--- a/src/main/java/org/apache/maven/plugin/nar/Executable.java
+++ b/src/main/java/org/apache/maven/plugin/nar/Executable.java
@@ -24,7 +24,6 @@ import java.util.List;
 /**
  *
  * @author Mark Donszelmann (Mark.Donszelmann@gmail.com)
- * @version $Id$
  */
 public interface Executable {
 
diff --git a/src/main/java/org/apache/maven/plugin/nar/Fortran.java b/src/main/java/org/apache/maven/plugin/nar/Fortran.java
index b579683..d994c78 100644
--- a/src/main/java/org/apache/maven/plugin/nar/Fortran.java
+++ b/src/main/java/org/apache/maven/plugin/nar/Fortran.java
@@ -23,7 +23,6 @@ package org.apache.maven.plugin.nar;
  * Fortran compiler tag
  *
  * @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/Fortran.java 0c1f0fc112ac 2007/09/12 18:18:23 duns $
  */
 public class Fortran extends Compiler {
   
diff --git a/src/main/java/org/apache/maven/plugin/nar/Java.java b/src/main/java/org/apache/maven/plugin/nar/Java.java
index 9bdc956..513dc8a 100644
--- a/src/main/java/org/apache/maven/plugin/nar/Java.java
+++ b/src/main/java/org/apache/maven/plugin/nar/Java.java
@@ -35,7 +35,6 @@ import org.apache.maven.plugin.MojoFailureException;
  * Java specifications for NAR
  *
  * @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/Java.java 0ee9148b7c6a 2007/09/20 18:42:29 duns $
  */
 public class Java {
 
diff --git a/src/main/java/org/apache/maven/plugin/nar/Javah.java b/src/main/java/org/apache/maven/plugin/nar/Javah.java
index ecf1bcc..6909846 100644
--- a/src/main/java/org/apache/maven/plugin/nar/Javah.java
+++ b/src/main/java/org/apache/maven/plugin/nar/Javah.java
@@ -45,7 +45,6 @@ import org.codehaus.plexus.util.StringUtils;
  * Sets up the javah configuration
  *
  * @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/Javah.java eeac31f37379 2007/07/24 04:02:00 duns $
  */
 public class Javah {
 
diff --git a/src/main/java/org/apache/maven/plugin/nar/Lib.java b/src/main/java/org/apache/maven/plugin/nar/Lib.java
index 2969d9f..b501174 100644
--- a/src/main/java/org/apache/maven/plugin/nar/Lib.java
+++ b/src/main/java/org/apache/maven/plugin/nar/Lib.java
@@ -37,7 +37,6 @@ import org.apache.tools.ant.Project;
  * Keeps info on a library
  *
  * @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/Lib.java eda4d0bbde3d 2007/07/03 16:52:10 duns $
  */
 public class Lib {
 
diff --git a/src/main/java/org/apache/maven/plugin/nar/Library.java b/src/main/java/org/apache/maven/plugin/nar/Library.java
index 9e3c80b..5026d4d 100644
--- a/src/main/java/org/apache/maven/plugin/nar/Library.java
+++ b/src/main/java/org/apache/maven/plugin/nar/Library.java
@@ -27,7 +27,6 @@ import java.util.List;
  * Sets up a library to create
  * 
  * @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/Library.java 19804ec9b6b9 2007/09/04 23:36:51 duns $
  */
 public class Library implements Executable {
 
diff --git a/src/main/java/org/apache/maven/plugin/nar/Linker.java b/src/main/java/org/apache/maven/plugin/nar/Linker.java
index c93464b..253c047 100644
--- a/src/main/java/org/apache/maven/plugin/nar/Linker.java
+++ b/src/main/java/org/apache/maven/plugin/nar/Linker.java
@@ -45,7 +45,6 @@ import org.codehaus.plexus.util.FileUtils;
  * Linker tag
  * 
  * @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/Linker.java 22df3eb318cc 2007/09/06 18:55:15 duns $
  */
 public class Linker {
 
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarArchiver.java b/src/main/java/org/apache/maven/plugin/nar/NarArchiver.java
index 2f2c78e..2272f15 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarArchiver.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarArchiver.java
@@ -24,7 +24,6 @@ import org.codehaus.plexus.archiver.zip.AbstractZipArchiver;
 /**
  * 
  * @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/NarArchiver.java eda4d0bbde3d 2007/07/03 16:52:10 duns $
  */
 public class NarArchiver extends AbstractZipArchiver {
 }
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarArtifact.java b/src/main/java/org/apache/maven/plugin/nar/NarArtifact.java
index 38df9f0..0608e56 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarArtifact.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarArtifact.java
@@ -25,7 +25,6 @@ import org.apache.maven.artifact.DefaultArtifact;
 /**
  * 
  * @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/NarArtifact.java eda4d0bbde3d 2007/07/03 16:52:10 duns $
  */
 public class NarArtifact extends DefaultArtifact {
 
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarArtifactHandler.java b/src/main/java/org/apache/maven/plugin/nar/NarArtifactHandler.java
index 9499481..ec3c269 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarArtifactHandler.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarArtifactHandler.java
@@ -25,7 +25,6 @@ import org.apache.maven.artifact.handler.ArtifactHandler;
 /**
  * 
  * @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/NarArtifactHandler.java 76e8ff7ad2b0 2007/07/24 04:15:54 duns $
  */
 public class NarArtifactHandler implements ArtifactHandler {
 	public String getPackaging() {
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarAssemblyMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarAssemblyMojo.java
index 7ce7100..ecf82ac 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarAssemblyMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarAssemblyMojo.java
@@ -38,7 +38,6 @@ import org.codehaus.plexus.util.FileUtils;
  * @requiresProject
  * @requiresDependencyResolution
  * @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/NarAssemblyMojo.java c867ab546be1 2007/07/05 21:26:30 duns $
  */
 public class NarAssemblyMojo extends AbstractDependencyMojo {
 
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarCompileMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarCompileMojo.java
index 3b21612..af66950 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarCompileMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarCompileMojo.java
@@ -50,7 +50,6 @@ import org.codehaus.plexus.util.StringUtils;
  * @phase compile
  * @requiresDependencyResolution compile
  * @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/NarCompileMojo.java 0ee9148b7c6a 2007/09/20 18:42:29 duns $
  */
 public class NarCompileMojo extends AbstractCompileMojo {
 
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarConstants.java b/src/main/java/org/apache/maven/plugin/nar/NarConstants.java
index 0643c78..3eaa127 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarConstants.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarConstants.java
@@ -21,7 +21,6 @@ package org.apache.maven.plugin.nar;
 
 /**
  * @author Mark Donszelmann
- * @version $Id$
  */
 public interface NarConstants {
     public final static String NAR_EXTENSION = "nar";
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarDownloadMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarDownloadMojo.java
index b81caa6..08c5546 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarDownloadMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarDownloadMojo.java
@@ -34,7 +34,6 @@ import org.apache.maven.plugin.MojoFailureException;
  * @requiresProject
  * @requiresDependencyResolution
  * @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/NarDownloadMojo.java c867ab546be1 2007/07/05 21:26:30 duns $
  */
 public class NarDownloadMojo extends AbstractDependencyMojo {
 
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarInfo.java b/src/main/java/org/apache/maven/plugin/nar/NarInfo.java
index 9deabc9..1074104 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarInfo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarInfo.java
@@ -34,7 +34,6 @@ import org.apache.maven.plugin.logging.Log;
 /**
  * 
  * @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/NarInfo.java 0ee9148b7c6a 2007/09/20 18:42:29 duns $
  */
 public class NarInfo {
 
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarIntegrationTestMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarIntegrationTestMojo.java
index 3fadb9c..f3d1d62 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarIntegrationTestMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarIntegrationTestMojo.java
@@ -73,16 +73,15 @@ import org.codehaus.plexus.util.StringUtils;
  * directories but disable the running of the tests by the
  * maven-surefire-plugin.
  * 
- * @author Jason van Zyl (modified by Mark Donszelmann, noted by FREEHEP)
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/NarIntegrationTestMojo.java eeac31f37379 2007/07/24 04:02:00 duns $,
- *          2.3 maven repository maven-surefire-plugin
+ * @author Jason van Zyl (modified by Mark Donszelmann, noted by DUNS)
+ * @version 2.3 maven repository maven-surefire-plugin and changes by DUNS
  * @requiresDependencyResolution test
  * @goal nar-integration-test
  * @phase integration-test
  */
-// FREEHEP, changed class name, inheritence, goal and phase
+// DUNS, changed class name, inheritence, goal and phase
 public class NarIntegrationTestMojo extends AbstractCompileMojo {
-	// FREEHEP added test for JNI module
+	// DUNS added test for JNI module
 	private boolean testJNIModule() {
 		for (Iterator i = getLibraries().iterator(); i.hasNext();) {
 			Library lib = (Library) i.next();
@@ -92,7 +91,7 @@ public class NarIntegrationTestMojo extends AbstractCompileMojo {
 		return false;
 	}
 
-	// FREEHEP added to get names
+	// DUNS added to get names
 	/**
 	 * @parameter expression="${project}"
 	 * @readonly
@@ -100,7 +99,7 @@ public class NarIntegrationTestMojo extends AbstractCompileMojo {
 	 */
 	private MavenProject project;
 
-	// FREEHEP added because of naming conflict
+	// DUNS added because of naming conflict
 	/**
 	 * Skip running of NAR plugins (any) altogether.
 	 * 
@@ -148,7 +147,7 @@ public class NarIntegrationTestMojo extends AbstractCompileMojo {
 	 * @parameter expression="${project.build.outputDirectory}"
 	 * @required
 	 */
-	// FREEHEP
+	// DUNS
 	// private File classesDirectory;
 	/**
 	 * The directory containing generated test classes of the project being
@@ -225,7 +224,7 @@ public class NarIntegrationTestMojo extends AbstractCompileMojo {
 	 * @required
 	 * @readonly
 	 */
-	// FREEHEP removed, already in superclass
+	// DUNS removed, already in superclass
 	// private ArtifactRepository localRepository;
 	/**
 	 * List of System properties to pass to the JUnit tests.
@@ -473,7 +472,7 @@ public class NarIntegrationTestMojo extends AbstractCompileMojo {
 	}
 
 	private boolean verifyParameters() throws MojoFailureException {
-		// FREEHEP, shouldSkip() does not work...
+		// DUNS, shouldSkip() does not work...
 		if (skipNAR) {
 			getLog()
 					.info(
@@ -649,7 +648,7 @@ public class NarIntegrationTestMojo extends AbstractCompileMojo {
 										testSourceDirectory.getAbsolutePath() });
 			} else {
 				String junitDirectoryTestSuite;
-				// FREEHEP NP check
+				// DUNS NP check
 				if (junitArtifact != null
 						&& junitArtifact.getBaseVersion().startsWith("4")) {
 					junitDirectoryTestSuite = "org.apache.maven.surefire.junit4.JUnit4DirectoryTestSuite";
@@ -690,7 +689,7 @@ public class NarIntegrationTestMojo extends AbstractCompileMojo {
 
 		ForkConfiguration fork = new ForkConfiguration();
 
-		// FREEHEP
+		// DUNS
 		if (project.getPackaging().equals("nar")
 				|| (getNarManager().getNarDependencies("test").size() > 0))
 			forkMode = "pertest";
@@ -722,7 +721,7 @@ public class NarIntegrationTestMojo extends AbstractCompileMojo {
 				fork.setWorkingDirectory(basedir);
 			}
 
-			// BEGINFREEHEP
+			// BEGINDUNS
 			if (argLine == null)
 				argLine = "";
 
@@ -800,7 +799,7 @@ public class NarIntegrationTestMojo extends AbstractCompileMojo {
 			if (getOS().equals(OS.WINDOWS)) {
 				environmentVariables.put("SystemRoot", NarUtil.getEnv("SystemRoot", "SystemRoot", "C:\\Windows"));
 			}
-			// ENDFREEHEP
+			// ENDDUNS
 
 			fork.setArgLine(argLine);
 
@@ -872,7 +871,7 @@ public class NarIntegrationTestMojo extends AbstractCompileMojo {
 		Artifact originatingArtifact = artifactFactory.createBuildArtifact(
 				"dummy", "dummy", "1.0", "jar");
 
-		// FREEHEP, use access method rather than "localRepository" field.
+		// DUNS, use access method rather than "localRepository" field.
 		return artifactResolver.resolveTransitively(Collections
 				.singleton(providerArtifact), originatingArtifact,
 				getLocalRepository(), remoteRepositories, metadataSource,
@@ -906,7 +905,7 @@ public class NarIntegrationTestMojo extends AbstractCompileMojo {
 
 		systemProperties.setProperty("basedir", basedir.getAbsolutePath());
 
-		// FREEHEP, use access method rather than "localRepository" field.
+		// DUNS, use access method rather than "localRepository" field.
 		systemProperties.setProperty("localRepository", getLocalRepository()
 				.getBasedir());
 
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarJavahMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarJavahMojo.java
index 5c0cee7..bc5e263 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarJavahMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarJavahMojo.java
@@ -30,7 +30,6 @@ import org.apache.maven.plugin.MojoFailureException;
  * @goal nar-javah
  * @phase compile
  * @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/NarJavahMojo.java eeac31f37379 2007/07/24 04:02:00 duns $
  */
 public class NarJavahMojo extends AbstractCompileMojo {
     
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarLogger.java b/src/main/java/org/apache/maven/plugin/nar/NarLogger.java
index 442af5e..d107739 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarLogger.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarLogger.java
@@ -28,7 +28,6 @@ import org.apache.tools.ant.Project;
  * Logger to connect the Ant logging to the Maven logging.
  *
  * @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/NarLogger.java 9589202406dd 2007/07/23 17:42:54 duns $
  */
 public class NarLogger implements BuildListener {
     
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarManager.java b/src/main/java/org/apache/maven/plugin/nar/NarManager.java
index 4872cd7..1e75117 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarManager.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarManager.java
@@ -47,9 +47,7 @@ import org.codehaus.plexus.util.FileUtils;
 
 /**
  * @author Mark Donszelmann (Mark.Donszelmann@gmail.com)
- * @version $Id$
  */
-
 public class NarManager {
 
 	private Log log;
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarPackageMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarPackageMojo.java
index 24c9fa3..6376769 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarPackageMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarPackageMojo.java
@@ -37,7 +37,6 @@ import org.codehaus.plexus.archiver.zip.ZipArchiver;
  * @phase package
  * @requiresProject
  * @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/NarPackageMojo.java 0ee9148b7c6a 2007/09/20 18:42:29 duns $
  */
 public class NarPackageMojo extends AbstractCompileMojo {
 
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 54e042a..90c19c0 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarResourcesMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarResourcesMojo.java
@@ -41,7 +41,6 @@ import org.codehaus.plexus.util.SelectorUtils;
  * @phase process-resources
  * @requiresProject
  * @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/NarResourcesMojo.java 2126b860c9c5 2007/07/31 23:19:30 duns $
  */
 public class NarResourcesMojo extends AbstractCompileMojo {
 
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarSystemGenerate.java b/src/main/java/org/apache/maven/plugin/nar/NarSystemGenerate.java
index 50cf773..207a490 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarSystemGenerate.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarSystemGenerate.java
@@ -36,7 +36,6 @@ import org.apache.maven.plugin.MojoFailureException;
  * @phase generate-sources
  * @requiresProject
  * @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/NarSystemGenerate.java d43b38443d0b 2007/09/13 18:31:01 duns $
  */
 public class NarSystemGenerate extends AbstractCompileMojo {
 
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarTestCompileMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarTestCompileMojo.java
index b23f86c..995a76f 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarTestCompileMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarTestCompileMojo.java
@@ -44,7 +44,6 @@ import org.apache.tools.ant.Project;
  * @phase test-compile
  * @requiresDependencyResolution test
  * @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/NarTestCompileMojo.java 0ee9148b7c6a 2007/09/20 18:42:29 duns $
  */
 public class NarTestCompileMojo extends AbstractCompileMojo {
 
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarTestMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarTestMojo.java
index 6412f80..cb98d65 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarTestMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarTestMojo.java
@@ -40,7 +40,6 @@ import org.codehaus.plexus.util.StringUtils;
  * @phase test
  * @requiresProject
  * @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/NarTestMojo.java 51709c87671c 2007/08/08 22:49:17 duns $
  */
 public class NarTestMojo extends AbstractCompileMojo {
 
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarUnArchiver.java b/src/main/java/org/apache/maven/plugin/nar/NarUnArchiver.java
index c8ce9e1..271f3ae 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarUnArchiver.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarUnArchiver.java
@@ -24,7 +24,6 @@ import org.codehaus.plexus.archiver.zip.AbstractZipUnArchiver;
 /**
  * 
  * @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/NarUnArchiver.java eda4d0bbde3d 2007/07/03 16:52:10 duns $
  */
 public class NarUnArchiver extends AbstractZipUnArchiver {
 }
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarUnpackMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarUnpackMojo.java
index a8de23c..4a3553d 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarUnpackMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarUnpackMojo.java
@@ -35,7 +35,6 @@ import org.codehaus.plexus.archiver.manager.ArchiverManager;
  * @requiresProject
  * @requiresDependencyResolution
  * @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/NarUnpackMojo.java eda4d0bbde3d 2007/07/03 16:52:10 duns $
  */
 public class NarUnpackMojo extends AbstractDependencyMojo {
 
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarUtil.java b/src/main/java/org/apache/maven/plugin/nar/NarUtil.java
index 05ec1db..8e21ae3 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarUtil.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarUtil.java
@@ -42,7 +42,6 @@ import org.codehaus.plexus.util.cli.Commandline;
 
 /**
  * @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/NarUtil.java 0ee9148b7c6a 2007/09/20 18:42:29 duns $
  */
 public class NarUtil {
 
diff --git a/src/main/java/org/apache/maven/plugin/nar/OS.java b/src/main/java/org/apache/maven/plugin/nar/OS.java
index 79822e6..2f8180a 100644
--- a/src/main/java/org/apache/maven/plugin/nar/OS.java
+++ b/src/main/java/org/apache/maven/plugin/nar/OS.java
@@ -22,7 +22,6 @@ package org.apache.maven.plugin.nar;
 /**
  * 
  * @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/OS.java bf894e19f5aa 2007/07/07 15:33:36 duns $
  */
 public interface OS {
 
diff --git a/src/main/java/org/apache/maven/plugin/nar/SysLib.java b/src/main/java/org/apache/maven/plugin/nar/SysLib.java
index c377f7e..a2bfe07 100644
--- a/src/main/java/org/apache/maven/plugin/nar/SysLib.java
+++ b/src/main/java/org/apache/maven/plugin/nar/SysLib.java
@@ -30,7 +30,6 @@ import org.apache.tools.ant.Project;
  * Keeps info on a system library
  *
  * @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/SysLib.java eda4d0bbde3d 2007/07/03 16:52:10 duns $
  */
 public class SysLib {
 
diff --git a/src/main/java/org/apache/maven/plugin/nar/Test.java b/src/main/java/org/apache/maven/plugin/nar/Test.java
index 4e88be1..3f4edaa 100644
--- a/src/main/java/org/apache/maven/plugin/nar/Test.java
+++ b/src/main/java/org/apache/maven/plugin/nar/Test.java
@@ -28,7 +28,6 @@ import org.apache.maven.plugin.MojoFailureException;
  * Sets up a test to create
  *
  * @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/Test.java c867ab546be1 2007/07/05 21:26:30 duns $
  */
 public class Test implements Executable {
 
diff --git a/src/main/resources/META-INF/plexus/components.xml b/src/main/resources/META-INF/plexus/components.xml
index a857d5d..fc35483 100644
--- a/src/main/resources/META-INF/plexus/components.xml
+++ b/src/main/resources/META-INF/plexus/components.xml
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you 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.
+-->
+
 <component-set>
     <components>
         <component>
@@ -6,22 +25,22 @@
             <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
             <configuration>
                 <phases>
-                    <generate-sources>org.freehep:freehep-nar-plugin:nar-download,
-                                      org.freehep:freehep-nar-plugin:nar-system-generate</generate-sources>
-                    <process-sources>org.freehep:freehep-nar-plugin:nar-unpack</process-sources>
+                    <generate-sources>org.apache.maven.plugins:maven-nar-plugin:nar-download,
+                                      org.apache.maven.plugins:maven-nar-plugin:nar-system-generate</generate-sources>
+                    <process-sources>org.apache.maven.plugins:maven-nar-plugin:nar-unpack</process-sources>
                     <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources,
-                                       org.freehep:freehep-nar-plugin:nar-resources</process-resources>
+                                       org.apache.maven.plugins:maven-nar-plugin:nar-resources</process-resources>
                     <compile>org.apache.maven.plugins:maven-compiler-plugin:compile,
-                             org.freehep:freehep-nar-plugin:nar-javah</compile>
-                    <process-classes>org.freehep:freehep-nar-plugin:nar-compile</process-classes>
+                             org.apache.maven.plugins:maven-nar-plugin:nar-javah</compile>
+                    <process-classes>org.apache.maven.plugins:maven-nar-plugin:nar-compile</process-classes>
                     <process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
                     <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile,
-                                  org.freehep:freehep-nar-plugin:nar-testCompile</test-compile>
+                                  org.apache.maven.plugins:maven-nar-plugin:nar-testCompile</test-compile>
                     <test>org.apache.maven.plugins:maven-surefire-plugin:test,
-                          org.freehep:freehep-nar-plugin:nar-test</test>
-                    <package>org.freehep:freehep-nar-plugin:nar-package,
+                          org.apache.maven.plugins:maven-nar-plugin:nar-test</test>
+                    <package>org.apache.maven.plugins:maven-nar-plugin:nar-package,
                              org.apache.maven.plugins:maven-jar-plugin:jar</package>
-                    <integration-test>org.freehep:freehep-nar-plugin:nar-integration-test</integration-test>
+                    <integration-test>org.apache.maven.plugins:maven-nar-plugin:nar-integration-test</integration-test>
                     <install>org.apache.maven.plugins:maven-install-plugin:install</install>
                     <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
                 </phases>
@@ -45,14 +64,13 @@
         <component>
             <role>org.codehaus.plexus.archiver.Archiver</role>
             <role-hint>nar-library</role-hint>
-            <implementation>org.freehep.maven.nar.NarArchiver</implementation>
             <instantiation-strategy>per-lookup</instantiation-strategy>
         </component>
         
         <component>
             <role>org.codehaus.plexus.archiver.UnArchiver</role>
             <role-hint>nar-library</role-hint>
-            <implementation>org.freehep.maven.nar.NarUnArchiver</implementation>
+            <implementation>org.apache.maven.plugin.nar.NarUnArchiver</implementation>
             <instantiation-strategy>per-lookup</instantiation-strategy>
         </component>
     </components>
diff --git a/src/main/resources/org/apache/maven/plugin/nar/aol.properties b/src/main/resources/org/apache/maven/plugin/nar/aol.properties
index 11a9e61..642ecac 100644
--- a/src/main/resources/org/apache/maven/plugin/nar/aol.properties
+++ b/src/main/resources/org/apache/maven/plugin/nar/aol.properties
@@ -1,8 +1,26 @@
 #
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+#
+
+#
 # AOL (Architecture-OperatingSystem-Linker) Default Values
 #
 # @author Mark Donszelmann
-# @version $Id$
 #
 
 #
@@ -337,7 +355,7 @@ ppc.MacOSX.gcc.jni.extension=jnilib
 #ppc.MacOSX.g++.arch.includes=lib/**/*.a lib/**/*.so lib/**/*.dylib lib/**/*.jnilib
 
 #
-# MacOSX ("Mac OS X" => MacOSX) Intel
+# MacOSX ("Mac OS X" => MacOSX) Intel (32 bits)
 #
 i386.MacOSX.linker=g++
 
@@ -379,6 +397,48 @@ i386.MacOSX.gcc.jni.extension=jnilib
 #i386.MacOSX.g++.arch.includes=lib/**/*.a lib/**/*.so lib/**/*.dylib lib/**/*.jnilib
 
 #
+# MacOSX ("Mac OS X" => MacOSX) Intel (64 bits)
+#
+x86_64.MacOSX.linker=g++
+
+x86_64.MacOSX.g++.cpp.compiler=g++
+x86_64.MacOSX.g++.cpp.defines=Darwin GNU_GCC 
+x86_64.MacOSX.g++.cpp.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion
+x86_64.MacOSX.g++.cpp.includes=**/*.cc **/*.cpp **/*.cxx
+x86_64.MacOSX.g++.cpp.excludes=
+
+x86_64.MacOSX.g++.c.compiler=gcc
+x86_64.MacOSX.g++.c.defines=Darwin GNU_GCC 
+x86_64.MacOSX.g++.c.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion
+x86_64.MacOSX.g++.c.includes=**/*.c
+x86_64.MacOSX.g++.c.excludes=
+
+x86_64.MacOSX.g++.fortran.compiler=gfortran
+x86_64.MacOSX.g++.fortran.defines=Darwin GNU_GCC 
+x86_64.MacOSX.g++.fortran.options=-Wall -fno-automatic -fno-second-underscore
+x86_64.MacOSX.g++.fortran.includes=**/*.f **/*.for
+x86_64.MacOSX.g++.fortran.excludes=
+
+x86_64.MacOSX.g++.java.include=include
+x86_64.MacOSX.g++.java.runtimeDirectory=IGNORED
+
+x86_64.MacOSX.g++.lib.prefix=lib
+x86_64.MacOSX.g++.shared.prefix=lib
+x86_64.MacOSX.g++.static.extension=a
+x86_64.MacOSX.g++.shared.extension=dylib
+x86_64.MacOSX.g++.plugin.extension=bundle
+x86_64.MacOSX.g++.jni.extension=jnilib
+x86_64.MacOSX.g++.executable.extension=
+
+# FIXME to be removed when NARPLUGIN-137
+x86_64.MacOSX.gcc.static.extension=a
+x86_64.MacOSX.gcc.shared.extension=dylib
+x86_64.MacOSX.gcc.plugin.extension=bundle
+x86_64.MacOSX.gcc.jni.extension=jnilib
+
+#x86_64.MacOSX.g++.arch.includes=lib/**/*.a lib/**/*.so lib/**/*.dylib lib/**/*.jnilib
+
+#
 # Solaris
 #
 sparc.SunOS.linker=CC