You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2005/12/03 19:19:35 UTC
svn commit: r351996 - in /geronimo/trunk: maven.xml
plugins/geronimo-assembly-plugin/maven.xml
plugins/geronimo-deployment-plugin/maven.xml
Author: djencks
Date: Sat Dec 3 10:19:30 2005
New Revision: 351996
URL: http://svn.apache.org/viewcvs?rev=351996&view=rev
Log:
better plugin:install behavior, 'new' build now works
Modified:
geronimo/trunk/maven.xml
geronimo/trunk/plugins/geronimo-assembly-plugin/maven.xml
geronimo/trunk/plugins/geronimo-deployment-plugin/maven.xml
Modified: geronimo/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/maven.xml?rev=351996&r1=351995&r2=351996&view=diff
==============================================================================
--- geronimo/trunk/maven.xml (original)
+++ geronimo/trunk/maven.xml Sat Dec 3 10:19:30 2005
@@ -29,55 +29,48 @@
<goal name="new0">
- <j:set var="maven.multiproject.includes" value="tranql/tranql/project.xml"/>
- <j:set var="maven.multiproject.excludes" value=""/>
- <attainGoal name="multiproject:install"/>
+ <maven:reactor basedir="${basedir}" includes="tranql/tranql/project.xml"
+ excludes="" goals="multiproject:install-callback" banner="tranql" ignoreFailures="false" />
</goal>
<goal name="new00">
- <j:set var="maven.multiproject.includes" value="tranql/connector/project.xml,tranql/vendor/*/project.xml"/>
- <j:set var="maven.multiproject.excludes" value=""/>
- <attainGoal name="multiproject:install"/>
+ <maven:reactor basedir="${basedir}" includes="tranql/connector/project.xml,tranql/vendor/*/*/project.xml,tranql/derby/*/project.xml"
+ excludes="" goals="multiproject:install-callback" banner="tranql-connector" ignoreFailures="false" />
</goal>
<goal name="new1">
- <j:set var="maven.multiproject.includes" value="modules/*/project.xml,plugins/*/project.xml"/>
- <j:set var="maven.multiproject.excludes" value="modules/assembly/project.xml"/>
- <attainGoal name="multiproject:install"/>
+ <maven:reactor basedir="${basedir}" includes="modules/*/project.xml,plugins/*/project.xml"
+ excludes="modules/assembly/project.xml" goals="multiproject:install-callback" banner="geronimo and geronimo-plugins" ignoreFailures="false" />
</goal>
<goal name="new2">
- <j:set var="maven.multiproject.includes" value="openejb/modules/core/project.xml,openejb/modules/pkgen-builder/project.xml,openejb/modules/openejb-builder/project.xml"/>
- <j:set var="maven.multiproject.excludes" value=""/>
- <attainGoal name="multiproject:install"/>
+ <maven:reactor basedir="${basedir}" includes="openejb/modules/core/project.xml,openejb/modules/pkgen-builder/project.xml,openejb/modules/openejb-builder/project.xml"
+ excludes="" goals="multiproject:install-callback" banner="openejb" ignoreFailures="false" />
</goal>
<goal name="new3">
- <j:set var="maven.multiproject.includes" value="applications/*/project.xml"/>
- <j:set var="maven.multiproject.excludes" value=""/>
- <attainGoal name="multiproject:install"/>
+ <maven:reactor basedir="${basedir}" includes="applications/*/project.xml"
+ excludes="" goals="multiproject:install-callback" banner="applications" ignoreFailures="false" />
</goal>
<goal name="new4">
- <j:set var="maven.multiproject.includes" value="configs/*/project.xml"/>
- <j:set var="maven.multiproject.excludes" value=""/>
- <attainGoal name="multiproject:install"/>
+ <maven:reactor basedir="${basedir}" includes="configs/*/project.xml"
+ excludes="" goals="multiproject:install-callback" banner="configurations" ignoreFailures="false" />
</goal>
<goal name="new5">
- <j:set var="maven.multiproject.includes" value="assemblies/*/project.xml"/>
- <j:set var="maven.multiproject.excludes" value=""/>
- <attainGoal name="multiproject:install"/>
+ <maven:reactor basedir="${basedir}" includes="assemblies/*/project.xml"
+ excludes="" goals="multiproject:install-callback" banner="tranql-connector" ignoreFailures="false" />
</goal>
<goal name="new">
- <!-- this really doesn't work -->
<attainGoal name="new0"/>
<attainGoal name="new00"/>
<attainGoal name="new1"/>
<attainGoal name="new2"/>
<attainGoal name="new3"/>
<attainGoal name="new4"/>
+ <attainGoal name="new5"/>
</goal>
<!-- ============= -->
Modified: geronimo/trunk/plugins/geronimo-assembly-plugin/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/maven.xml?rev=351996&r1=351995&r2=351996&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/maven.xml (original)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/maven.xml Sat Dec 3 10:19:30 2005
@@ -17,11 +17,18 @@
-->
-<!-- $Rev: 158417 $ $Date: 2005-03-20 23:25:45 -0800 (Sun, 20 Mar 2005) $ -->
+<!-- $Rev: 351514 $ $Date: 2005-12-01 15:12:20 -0800 (Thu, 01 Dec 2005) $ -->
<project default="plugin:install">
<goal name="default">
<attainGoal name="plugin:install-now"/>
<attainGoal name="plugin:repository-install"/>
</goal>
+
+ <postGoal name="plugin:install">
+ <attainGoal name="plugin:install-now"/>
+ <attainGoal name="plugin:repository-install"/>
+ </postGoal>
+
+
</project>
Modified: geronimo/trunk/plugins/geronimo-deployment-plugin/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-deployment-plugin/maven.xml?rev=351996&r1=351995&r2=351996&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-deployment-plugin/maven.xml (original)
+++ geronimo/trunk/plugins/geronimo-deployment-plugin/maven.xml Sat Dec 3 10:19:30 2005
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2004 The Apache Software Foundation
+ Copyright 2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -19,93 +19,16 @@
<!-- $Rev$ $Date$ -->
-<project default="default"
- xmlns:ant="jelly:ant"
- xmlns:artifact="jelly:artifact"
- xmlns:j="jelly:core">
-
- <!-- ================= -->
- <!-- Global Properties -->
- <!-- ================= -->
-
- <!-- Determine what the top-level project root is -->
- <j:set var="project.root" value="${pom.parentBasedir().getParentFile().getCanonicalFile()}"/>
-
- <!-- Load the global properties -->
- <ant:property file="${project.root}/etc/global.properties"/>
-
-
- <!-- ==================== -->
- <!-- Default Global Goals -->
- <!-- ==================== -->
-
+<project default="plugin:install">
<goal name="default">
<attainGoal name="plugin:install-now"/>
- <attainGoal name="doinstall"/>
- </goal>
-
- <goal name="build">
- <attainGoal name="default"/>
- </goal>
-
- <goal name="rebuild">
- <attainGoal name="clean"/>
- <attainGoal name="build"/>
+ <attainGoal name="plugin:repository-install"/>
</goal>
- <postGoal name="plugin:install-now">
- <attainGoal name="doinstall"/>
+ <postGoal name="plugin:install">
+ <attainGoal name="plugin:install-now"/>
+ <attainGoal name="plugin:repository-install"/>
</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"/-->
- </goal>
-
- <!-- Remove the log files -->
- <goal name="clobber"
- description="Removes all (non-repository installed) build generated files">
-
- <!-- Let clean:clean do some work first -->
- <attainGoal name="clean:clean"/>
-
- <j:jelly xmlns="jelly:ant">
- <delete quiet="false" failonerror="false">
- <fileset dir="${basedir}">
- <include name="maven.log"/>
- <include name="velocity.log*"/>
- <include name="junit*.properties"/>
- </fileset>
- </delete>
- </j:jelly>
- </goal>
-
- <goal name="java-src"
- description="Creates an archive containing only java source.">
- <ant:mkdir dir="${basedir}/target"/>
- <ant:jar destfile="${basedir}/target/${pom.artifactId}-${pom.currentVersion}-java-src.jar">
- <fileset dir="${basedir}/src/java"/>
- </ant:jar>
- </goal>
-
- <goal name="jar:deploy">
- <attainGoal name="plugin:repository-deploy"/>
- </goal>
</project>