From 7e67a8e010cc8b42b88fea00ea57a0df5dafd692 Mon Sep 17 00:00:00 2001
From: Mark Donszelmann <Mark.Donszelmann@gmail.com>
Date: Thu, 3 Dec 2009 15:18:49 +0100
Subject: Fixed NAR-72

---
 src/main/java/org/apache/maven/plugin/nar/NarSystemMojo.java | 4 +++-
 src/main/resources/META-INF/plexus/components.xml            | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/main')

diff --git a/src/main/java/org/apache/maven/plugin/nar/NarSystemMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarSystemMojo.java
index 0eb2905..24443c3 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarSystemMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarSystemMojo.java
@@ -30,9 +30,11 @@ import org.apache.maven.plugin.MojoFailureException;
 
 /**
  * Generates a NarSystem class with static methods to use inside the java part of the library.
+ * Runs in generate-resources rather than generate-sources to allow the maven-swig-plugin (which runs in
+ * generate-sources) to configure the nar plugin and to let it generate a proper system file. 
  * 
  * @goal nar-system-generate
- * @phase generate-sources
+ * @phase generate-resources
  * @requiresProject
  * @author Mark Donszelmann
  */
diff --git a/src/main/resources/META-INF/plexus/components.xml b/src/main/resources/META-INF/plexus/components.xml
index 0308dc3..4b508c1 100644
--- a/src/main/resources/META-INF/plexus/components.xml
+++ b/src/main/resources/META-INF/plexus/components.xml
@@ -26,13 +26,13 @@
         <phases>
           <validate>org.apache.maven.plugins:maven-nar-plugin:nar-validate</validate>
           <initialize></initialize>
-          <generate-sources>org.apache.maven.plugins:maven-nar-plugin:nar-download,
-            org.apache.maven.plugins:maven-nar-plugin:nar-system-generate
+          <generate-sources>org.apache.maven.plugins:maven-nar-plugin:nar-download
           </generate-sources>
           <process-sources>org.apache.maven.plugins:maven-nar-plugin:nar-unpack,
             org.apache.maven.plugins:maven-nar-plugin:nar-gnu-configure
           </process-sources>
-          <generate-resources></generate-resources>
+          <generate-resources>org.apache.maven.plugins:maven-nar-plugin:nar-system-generate
+          </generate-resources>
           <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources,
             org.apache.maven.plugins:maven-nar-plugin:nar-resources,
             org.apache.maven.plugins:maven-nar-plugin:nar-gnu-resources
-- 
cgit v1.2.3