geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r328772 - in /geronimo/trunk: applications/magicGball/ plugins/geronimo-assembly-plugin/ plugins/geronimo-deployment-plugin/ plugins/geronimo-packaging-plugin/
Date Thu, 27 Oct 2005 02:57:15 GMT
Author: dims
Date: Wed Oct 26 19:57:11 2005
New Revision: 328772

URL: http://svn.apache.org/viewcvs?rev=328772&view=rev
Log:
- With this checkin m:rebuild-all works properly 
  [Fixes problem reported here - http://mail-archives.apache.org/mod_mbox/geronimo-dev/200510.mbox/%3c2fa745a40510260830l4e517a41k5b5229a94d7a99ed@mail.gmail.com%3e]
- Basically magicGBall uses the maven deployment plugin, making it explicit here.
- Cleanup a few names in modules/*/project.xml
- replace install with install-now in doInstall for plugins.

Notes: Basically the old plugin was getting installed (picked up from some remote maven repo)
and switching the order ensures that depolyment plugin is built and installed before it is
used anywhere. also the install-now option adds the plugin for instant use (not a subsequent
run)


Modified:
    geronimo/trunk/applications/magicGball/project.xml
    geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml
    geronimo/trunk/plugins/geronimo-deployment-plugin/maven.xml
    geronimo/trunk/plugins/geronimo-deployment-plugin/project.xml
    geronimo/trunk/plugins/geronimo-packaging-plugin/project.xml

Modified: geronimo/trunk/applications/magicGball/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/magicGball/project.xml?rev=328772&r1=328771&r2=328772&view=diff
==============================================================================
--- geronimo/trunk/applications/magicGball/project.xml (original)
+++ geronimo/trunk/applications/magicGball/project.xml Wed Oct 26 19:57:11 2005
@@ -26,7 +26,7 @@
     <!-- Module Identification -->
     <!-- ===================== -->
 
-    <name>The Magic G Ball</name>
+    <name>Geronimo :: The Magic G Ball Sample Application</name>
     <id>magicGball</id>
 <!--    <currentVersion>0.01234-alpha0</currentVersion>-->
 
@@ -40,6 +40,12 @@
             <artifactId>geronimo-spec-j2ee</artifactId>
             <version>1.4-rc4</version>
         </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-deployment-plugin</artifactId>
+            <version>${pom.currentVersion}</version>
+            <type>plugin</type>
+        </dependency>
     </dependencies>
 
     <build>

Modified: geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml?rev=328772&r1=328771&r2=328772&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml (original)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml Wed Oct 26 19:57:11 2005
@@ -21,7 +21,7 @@
     <pomVersion>3</pomVersion>
     <groupId>geronimo</groupId>
     <id>geronimo-assembly-plugin</id>
-    <name>Geronimo Assembly Plugin</name>
+    <name>Geronimo :: Maven Assembly Plugin</name>
     <description>A plugin used to assemble a distribution of Geronimo</description>
     <currentVersion>1.0-SNAPSHOT</currentVersion>
 

Modified: geronimo/trunk/plugins/geronimo-deployment-plugin/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-deployment-plugin/maven.xml?rev=328772&r1=328771&r2=328772&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-deployment-plugin/maven.xml (original)
+++ geronimo/trunk/plugins/geronimo-deployment-plugin/maven.xml Wed Oct 26 19:57:11 2005
@@ -21,6 +21,7 @@
 
 <project default="default"
     xmlns:ant="jelly:ant"
+    xmlns:artifact="jelly:artifact"
     xmlns:j="jelly:core">
 
     <!-- ================= -->
@@ -39,7 +40,7 @@
     <!-- ==================== -->
 
     <goal name="default">
-        <attainGoal name="plugin:install"/>
+        <attainGoal name="plugin:install-now"/>
         <attainGoal name="doinstall"/>
     </goal>
 
@@ -52,7 +53,7 @@
         <attainGoal name="build"/>
     </goal>
 
-    <postGoal name="plugin:install">
+    <postGoal name="plugin:install-now">
         <attainGoal name="doinstall"/>
     </postGoal>
 

Modified: geronimo/trunk/plugins/geronimo-deployment-plugin/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-deployment-plugin/project.xml?rev=328772&r1=328771&r2=328772&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-deployment-plugin/project.xml (original)
+++ geronimo/trunk/plugins/geronimo-deployment-plugin/project.xml Wed Oct 26 19:57:11 2005
@@ -22,7 +22,7 @@
 
     <groupId>geronimo</groupId>
     <id>geronimo-deployment-plugin</id>
-    <name>Geronimo maven deployment plugin</name>
+    <name>Geronimo :: Maven Deployment Plugin</name>
     <organization>
         <name>Apache Software Foundation</name>
         <url>http://www.apache.org/</url>

Modified: geronimo/trunk/plugins/geronimo-packaging-plugin/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-packaging-plugin/project.xml?rev=328772&r1=328771&r2=328772&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-packaging-plugin/project.xml (original)
+++ geronimo/trunk/plugins/geronimo-packaging-plugin/project.xml Wed Oct 26 19:57:11 2005
@@ -21,7 +21,7 @@
     <pomVersion>3</pomVersion>
     <groupId>geronimo</groupId>
     <id>geronimo-packaging-plugin</id>
-    <name>Geronimo Packaging Plugin</name>
+    <name>Geronimo :: Maven Packaging Plugin</name>
     <currentVersion>1.0-SNAPSHOT</currentVersion>
 
     <dependencies>



Mime
View raw message