You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jv...@apache.org on 2003/01/06 07:21:06 UTC
cvs commit: jakarta-turbine-maven/src/plugins-build/xdoc maven.xml
jvanzyl 2003/01/05 22:21:06
Modified: src/plugins-build/deploy plugin.jelly
src/plugins-build/ear plugin.jelly
src/plugins-build/ejb plugin.jelly
src/plugins-build/java plugin.jelly
src/plugins-build/plexus plugin.jelly
src/plugins-build/plexus/templates classworlds.vm
src/plugins-build/war plugin.jelly
Removed: src/plugins-build/ant maven.xml
src/plugins-build/antlr maven.xml
src/plugins-build/aptdoc maven.xml
src/plugins-build/aspectj maven.xml
src/plugins-build/cactus maven.xml
src/plugins-build/castor maven.xml
src/plugins-build/changelog maven.xml
src/plugins-build/checkstyle maven.xml
src/plugins-build/clover maven.xml
src/plugins-build/codeswitcher maven.xml
src/plugins-build/console maven.xml
src/plugins-build/deploy maven.xml
src/plugins-build/developer-activity maven.xml
src/plugins-build/dist maven.xml
src/plugins-build/docbook maven.xml
src/plugins-build/ear maven.xml
src/plugins-build/eclipse maven.xml
src/plugins-build/ejb maven.xml
src/plugins-build/file-activity maven.xml
src/plugins-build/genapp maven.xml
src/plugins-build/genapp/src/pom maven.xml
src/plugins-build/gump maven.xml
src/plugins-build/idea maven.xml
src/plugins-build/j2ee maven.xml
src/plugins-build/jalopy maven.xml
src/plugins-build/java maven.xml
src/plugins-build/javadoc maven.xml
src/plugins-build/jbuilder maven.xml
src/plugins-build/jdepend maven.xml
src/plugins-build/jdiff maven.xml
src/plugins-build/jnlp maven.xml
src/plugins-build/junit-report maven.xml
src/plugins-build/junitdoclet maven.xml
src/plugins-build/jxr maven.xml
src/plugins-build/latex maven.xml
src/plugins-build/latka maven.xml
src/plugins-build/license maven.xml
src/plugins-build/pdf maven.xml
src/plugins-build/perforce maven.xml
src/plugins-build/plexus maven.xml
src/plugins-build/plugin maven.xml
src/plugins-build/pom maven.xml
src/plugins-build/sea maven.xml
src/plugins-build/site maven.xml
src/plugins-build/statcvs maven.xml
src/plugins-build/struts maven.xml
src/plugins-build/tasklist maven.xml
src/plugins-build/test maven.xml
src/plugins-build/uberjar maven.xml
src/plugins-build/vdoclet maven.xml
src/plugins-build/war maven.xml
src/plugins-build/webserver maven.xml
src/plugins-build/wizard maven.xml
src/plugins-build/word2html maven.xml
src/plugins-build/xdoc maven.xml
Log:
o removing the individual maven.xml files as one can now be shared among
them.
o using the new getArtifactDirectory() method in the Project class. No
POM changes are required. Just the internal mechanics of picking the
artifact directory has changed. Same logic, if the groupId is specified
it is used, otherwise the id is used.
Revision Changes Path
1.13 +22 -5 jakarta-turbine-maven/src/plugins-build/deploy/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/deploy/plugin.jelly,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- plugin.jelly 4 Jan 2003 23:41:50 -0000 1.12
+++ plugin.jelly 6 Jan 2003 06:21:04 -0000 1.13
@@ -8,7 +8,14 @@
xmlns:util="jelly:util"
xmlns:log="jelly:log"
xmlns:m="maven">
-
+
+ <!--
+ |
+ | FIX ME: It is the additional siteCommand options that is causing the
+ | deploy:artifact tag to hang indefinitely.
+ |
+ -->
+
<!-- ================================================================== -->
<!-- D E P L O Y A R T I F A C T T A G -->
<!-- ================================================================== -->
@@ -57,13 +64,13 @@
<j:when test="${typeX != 'X'}">
<property
name="resolvedDirectory"
- value="${siteDirectory}/${pom.groupId}/${type}"
+ value="${siteDirectory}/${pom.artifactDirectory}/${type}"
/>
</j:when>
<j:otherwise>
<property
name="resolvedDirectory"
- value="${siteDirectory}/${pom.groupId}"
+ value="${siteDirectory}/${pom.artifactDirectory}"
/>
</j:otherwise>
</j:choose>
@@ -157,14 +164,24 @@
<!-- ================================================================== -->
<!-- D E P L O Y P O M -->
<!-- ================================================================== -->
+ <!-- POMs are deployed in the form ${pom.id}-${pom.currentVersion}.pom -->
+ <!-- to match the same versioning convention as JARs. Having the POMs -->
+ <!-- deployed during each release will allow someone to build any -->
+ <!-- version of a project reliably. -->
+ <!-- ================================================================== -->
<goal name="deploy:pom"
description="Deploy POM to the central repository.">
-
+
+ <copy file="project.xml" tofile="${pom.id}-${pom.currentVersion}.pom"/>
+
<deploy:artifact
- artifact="project.xml"
+ artifact="${pom.id}-${pom.currentVersion}.pom"
+ type="poms"
assureDirectoryCommand="mkdir -p"
/>
+
+ <delete file="${pom.id}-${pom.currentVersion}.pom"/>
</goal>
1.4 +1 -1 jakarta-turbine-maven/src/plugins-build/ear/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/ear/plugin.jelly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.jelly 4 Jan 2003 12:40:29 -0000 1.3
+++ plugin.jelly 6 Jan 2003 06:21:04 -0000 1.4
@@ -81,7 +81,7 @@
description="Install the ear in the local repository">
<property name="maven.ear.install.dir"
- value="${maven.repo.local}/${pom.groupId}/ears"/>
+ value="${maven.repo.local}/${pom.artifactDirectory}/ears"/>
<mkdir dir="${maven.ear.install.dir}"/>
<copy file="${maven.build.dir}/${maven.final.name}.ear"
tofile="${maven.ear.install.dir}/${maven.final.name}.ear"/>
1.4 +1 -1 jakarta-turbine-maven/src/plugins-build/ejb/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/ejb/plugin.jelly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.jelly 4 Jan 2003 12:42:17 -0000 1.3
+++ plugin.jelly 6 Jan 2003 06:21:04 -0000 1.4
@@ -88,7 +88,7 @@
description="Install the ejb in the local repository">
<property name="maven.ejb.install.dir"
- value="${maven.repo.local}/${pom.groupId}/ejbs"/>
+ value="${maven.repo.local}/${pom.artifactDirectory}/ejbs"/>
<mkdir dir="${maven.ejb.install.dir}"/>
<copy file="${maven.build.dir}/${maven.final.name}.jar"
tofile="${maven.ejb.install.dir}/${maven.final.name}.jar"/>
1.40 +15 -7 jakarta-turbine-maven/src/plugins-build/java/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/java/plugin.jelly,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- plugin.jelly 2 Jan 2003 14:57:50 -0000 1.39
+++ plugin.jelly 6 Jan 2003 06:21:05 -0000 1.40
@@ -195,13 +195,13 @@
<m:user-check user="${maven.username}"/>
<attainGoal name="jar:snapshot"/>
<property name="maven.jar.to.deploy" value="${maven.final.name}.jar"/>
- <property name="dir" value="${maven.repo.central.directory}/${pom.groupId}/jars"/>
+ <property name="dir" value="${maven.repo.central.directory}/${pom.artifactDirectory}/jars"/>
<deploy:artifact
artifact="${maven.build.dir}/${maven.jar.to.deploy}"
type="jars"
assureDirectoryCommand="mkdir -p"
- siteCommand="cd @deployDirectory@; chmod g+w ${maven.jar.to.deploy}; chgrp maven ${maven.jar.to.deploy}; ln -sf ${maven.jar.to.deploy} ${pom.id}-SNAPSHOT.jar; md5sum ${maven.jar.to.deploy} | awk '{print $1}' > ${maven.jar.to.deploy}.md5"
+ siteCommand="cd @deployDirectory@; chmod g+w ${maven.jar.to.deploy}; chgrp maven ${maven.jar.to.deploy}; ln -sf ${maven.jar.to.deploy} ${pom.id}-SNAPSHOT.jar; md5sum ${maven.jar.to.deploy} | sed 's/ .*$//' > ${maven.jar.to.deploy}.md5"
/>
</goal>
@@ -222,7 +222,7 @@
artifact="${maven.build.dir}/${maven.jar.to.deploy}"
type="jars"
assureDirectoryCommand="mkdir -p"
- siteCommand="cd @deployDirectory@; chmod g+w ${maven.jar.to.deploy}; md5sum ${maven.jar.to.deploy} | awk '{print $1}' > ${maven.jar.to.deploy}.md5"
+ siteCommand="cd @deployDirectory@; chmod g+w ${maven.jar.to.deploy}; md5sum ${maven.jar.to.deploy} | sed 's/ .*$//' > ${maven.jar.to.deploy}.md5"
/>
</goal>
@@ -232,13 +232,20 @@
<!-- ================================================================== -->
<goal name="jar:install" prereqs="java:jar"
- description="Install the jar in the local repository">
+ description="Install the jar in the local repository">
- <property name="jardir__" value="${maven.repo.local}/${pom.groupId}/jars"/>
+ <echo>
+ id = '${pom.id}'
+ groupId = '${pom.groupId}'
+ artifactDirectory = '${pom.artifactDirectory}'
+ </echo>
+
+ <property name="jardir__" value="${maven.repo.local}/${pom.artifactDirectory}/jars"/>
<mkdir dir="${jardir__}"/>
<copy
file="${maven.build.dir}/${maven.final.name}.jar"
todir="${jardir__}"
+ overwrite="true"
/>
</goal>
@@ -250,11 +257,12 @@
name="jar:install-snapshot" prereqs="jar:snapshot"
description="Install a snapshot jar in the local repository">
- <property name="jardir__" value="${maven.repo.local}/${pom.groupId}/jars"/>
+ <property name="jardir__" value="${maven.repo.local}/${pom.artifactDirectory}/jars"/>
<mkdir dir="${jardir__}"/>
<copy
file="${maven.build.dir}/${maven.final.name}.jar"
- tofile="${jardir__}/${pom.groupId}-SNAPSHOT.jar"
+ tofile="${jardir__}/${pom.artifactDirectory}-SNAPSHOT.jar"
+ overwrite="true"
/>
</goal>
1.7 +10 -11 jakarta-turbine-maven/src/plugins-build/plexus/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/plexus/plugin.jelly,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plugin.jelly 12 Dec 2002 07:33:27 -0000 1.6
+++ plugin.jelly 6 Jan 2003 06:21:05 -0000 1.7
@@ -1,9 +1,11 @@
<project
xmlns:j="jelly:core"
xmlns:maven="jelly:maven"
- xmlns:texen="texen"
+ xmlns:util="jelly:util"
+ xmlns:velocity="jelly:org.apache.maven.jelly.tags.velocity.VelocityTagLibrary"
xmlns:reactor="reactor"
- xmlns:deploy="deploy">
+ xmlns:deploy="deploy"
+ xmlns:plexus="plexus">
<!-- ===================================================================== -->
<!-- D E P L O Y P L E X U S -->
@@ -74,18 +76,15 @@
<goal
name="classworlds-configuration"
- prereqs="init-texen-tag"
description="Generate launcher configuration">
- <maven:pom projectDescriptor="${plugin.dir}/plexus.pom" var="plexusPom"/>
+ <maven:pom projectDescriptor="${plugin.dir}/plexus.pom" var="project"/>
- <texen:texen
- controlTemplate="${maven.plexus.launcherConfigurationTemplate}"
- outputDirectory="${maven.plexus.conf}"
- templatePath="${maven.plexus.templatePath}"
- outputFile="${maven.plexus.launcherConfiguration}"
- mavenProject="${plexusPom}"
- />
+ <velocity:merge
+ name="${maven.plexus.conf}/${maven.plexus.launcherConfiguration}"
+ basedir="${maven.plexus.templatePath}"
+ template="${maven.plexus.launcherConfigurationTemplate}"/>
+
</goal>
<!-- ===================================================================== -->
1.3 +1 -1 jakarta-turbine-maven/src/plugins-build/plexus/templates/classworlds.vm
Index: classworlds.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/plexus/templates/classworlds.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- classworlds.vm 12 Dec 2002 07:33:28 -0000 1.2
+++ classworlds.vm 6 Jan 2003 06:21:05 -0000 1.3
@@ -3,7 +3,7 @@
[core]
#foreach ($jar in $project.dependencies)
#if (!$jar.id.startsWith("classworlds") && !$jar.id.startsWith("junit"))
-load ${lib}/${jar.artifact}jar
+load ${lib}/${jar.artifact}
#end
#end
load ${lib}/${project.id}-${project.currentVersion}.jar
1.20 +1 -1 jakarta-turbine-maven/src/plugins-build/war/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/war/plugin.jelly,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- plugin.jelly 4 Jan 2003 12:39:14 -0000 1.19
+++ plugin.jelly 6 Jan 2003 06:21:06 -0000 1.20
@@ -133,7 +133,7 @@
description="Install the war in the local repository">
<property name="maven.war.install.dir"
- value="${maven.repo.local}/${pom.groupId}/wars"/>
+ value="${maven.repo.local}/${pom.artifactDirectory}/wars"/>
<mkdir dir="${maven.war.install.dir}"/>
<copy file="${maven.war.build.dir}/${maven.war.final.name}"
tofile="${maven.war.install.dir}/${maven.war.final.name}"/>