geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: rev 54797 - in geronimo/trunk: . plugins/maven-geronimo-plugin plugins/maven-xpom-plugin
Date Thu, 14 Oct 2004 19:06:51 GMT
Author: dain
Date: Thu Oct 14 12:06:49 2004
New Revision: 54797

Modified:
   geronimo/trunk/plugins/maven-geronimo-plugin/maven.xml
   geronimo/trunk/plugins/maven-xpom-plugin/maven.xml
   geronimo/trunk/project.properties
Log:
Updated maven plugin builds to install a plugin jar into the local repo
Added all plugins into the main build since they are need by sub projects


Modified: geronimo/trunk/plugins/maven-geronimo-plugin/maven.xml
==============================================================================
--- geronimo/trunk/plugins/maven-geronimo-plugin/maven.xml	(original)
+++ geronimo/trunk/plugins/maven-geronimo-plugin/maven.xml	Thu Oct 14 12:06:49 2004
@@ -40,6 +40,7 @@
 
     <goal name="default">
         <attainGoal name="plugin:install"/>
+        <attainGoal name="doinstall"/>
     </goal>
 
     <goal name="build">
@@ -51,6 +52,26 @@
         <attainGoal name="build"/>
     </goal>
 
+    <postGoal name="plugin:install">
+        <attainGoal name="doinstall"/>
+    </postGoal>
+
+    <goal name="doinstall">
+        <!--this seems to be needed for the dependency on the plugin to work-->
+        <ant:property name="pluginsDir" value="${maven.repo.local}/${pom.artifactDirectory}/plugins"/>
+        <ant:mkdir dir="${pluginsDir}"/>
+        <ant:copy
+            file="${basedir}/target/${pom.artifactId}-${pom.currentVersion}.jar"
+            todir="${pluginsDir}"
+            overwrite="true"
+            />
+        <!--actually install the plugin into the cache-->
+        <mkdir dir="${maven.plugin.unpacked.dir}/${pom.artifactId}-${pom.currentVersion}"/>
+        <ant:unjar
+            src="${basedir}/target/${pom.artifactId}-${pom.currentVersion}.jar"
+            dest="${maven.plugin.unpacked.dir}/${pom.artifactId}-${pom.currentVersion}/"/>
+    </goal>
+
     <goal name="clover.wrapper">
         <!-- no src/test, don't run clover -->
         <!--attainGoal name="clover"/-->
@@ -86,5 +107,4 @@
     <goal name="jar:deploy">
         <attainGoal name="plugin:repository-deploy"/>
     </goal>
-
 </project>

Modified: geronimo/trunk/plugins/maven-xpom-plugin/maven.xml
==============================================================================
--- geronimo/trunk/plugins/maven-xpom-plugin/maven.xml	(original)
+++ geronimo/trunk/plugins/maven-xpom-plugin/maven.xml	Thu Oct 14 12:06:49 2004
@@ -39,7 +39,8 @@
     <!-- ==================== -->
 
     <goal name="default">
-        <attainGoal name="plugin:install"/>
+        <attainGoal name="jar:jar"/>
+        <attainGoal name="doinstall"/>
     </goal>
 
     <goal name="build">
@@ -49,6 +50,26 @@
     <goal name="rebuild">
         <attainGoal name="clean"/>
         <attainGoal name="build"/>
+    </goal>
+
+    <postGoal name="plugin:install">
+        <attainGoal name="doinstall"/>
+    </postGoal>
+
+    <goal name="doinstall">
+        <!--this seems to be needed for the dependency on the plugin to work-->
+        <ant:property name="pluginsDir" value="${maven.repo.local}/${pom.artifactDirectory}/plugins"/>
+        <ant:mkdir dir="${pluginsDir}"/>
+        <ant:copy
+            file="${basedir}/target/${pom.artifactId}-${pom.currentVersion}.jar"
+            todir="${pluginsDir}"
+            overwrite="true"
+            />
+        <!--actually install the plugin into the cache-->
+        <mkdir dir="${maven.plugin.unpacked.dir}/${pom.artifactId}-${pom.currentVersion}"/>
+        <ant:unjar
+            src="${basedir}/target/${pom.artifactId}-${pom.currentVersion}.jar"
+            dest="${maven.plugin.unpacked.dir}/${pom.artifactId}-${pom.currentVersion}/"/>
     </goal>
 
     <goal name="clover.wrapper">

Modified: geronimo/trunk/project.properties
==============================================================================
--- geronimo/trunk/project.properties	(original)
+++ geronimo/trunk/project.properties	Thu Oct 14 12:06:49 2004
@@ -40,7 +40,7 @@
 
 #multiproject properties
 maven.multiproject.includes=\
-plugins/maven-xmlbeans-plugin/project.xml,\
+plugins/*/project.xml,\
 specs/*/project.xml,\
 openejb/modules/*/project.xml,\
 applications/*/project.xml,\

Mime
View raw message