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/28 06:06:47 UTC
cvs commit: jakarta-turbine-maven/src/plugins-build/plexus/src/plugin-resources/templates classworlds.vm
jvanzyl 2003/01/27 21:06:47
Modified: src/plugins-build/plexus NOTES.txt plugin.jelly
plugin.properties project.xml
src/plugins-build/plexus/src/plugin-resources/templates
classworlds.vm
Log:
o We can assemble a runtime again after all the changes to plexus.
Revision Changes Path
1.3 +1 -1 jakarta-turbine-maven/src/plugins-build/plexus/NOTES.txt
Index: NOTES.txt
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/plexus/NOTES.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NOTES.txt 25 Jan 2003 19:40:16 -0000 1.2
+++ NOTES.txt 28 Jan 2003 05:06:47 -0000 1.3
@@ -1,6 +1,6 @@
o Need to make a place for components so that I can run the reactor
over the whole set to make the lookup table for retrieving components
- in the configuration.
+ in the configuration. DONE.
o The lookup table of components needs to become an artifact so that it
can always be consulted when someone is trying to assemble a container.
1.3 +20 -9 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.jelly 28 Jan 2003 04:26:30 -0000 1.2
+++ plugin.jelly 28 Jan 2003 05:06:47 -0000 1.3
@@ -45,10 +45,6 @@
<mkdir dir="${maven.plexus.log}"/>
<mkdir dir="${maven.plexus.work}"/>
- <copy todir="${maven.plexus.conf}">
- <fileset dir="${plugin.dir}/src/conf"/>
- </copy>
-
<mkdir dir="${maven.plexus.components}"/>
<!--
@@ -59,7 +55,7 @@
-->
<maven:pom
- projectDescriptor="${maven.repo.local}/plexus/poms/plexus-0.2.pom"
+ projectDescriptor="${maven.plexus.pom}"
var="plexusPom"/>
<get
@@ -80,7 +76,7 @@
<!-- Copy the plexus dependencies into the runtime lib/. -->
<deploy:copy-deps
- projectDescriptor="${plugin.dir}/plexus.pom"
+ projectDescriptor="${maven.plexus.pom}"
todir="${maven.plexus.lib}"
excludes="junit"/>
@@ -113,14 +109,27 @@
<goal name="plexus:find-components">
<plexus:find-implementations var="implementations" configuration="${conf}"/>
+
+ <get
+ src="http://www.ibiblio.org/maven/plexus/plexus-component.manifest"
+ dest="${plugin.dir}/plexus-component.manifest"/>
+
+ <util:properties
+ uri="file:${plugin.dir}/plexus-component.manifest"
+ var="components"/>
- <util:properties uri="file:${plugin.dir}/components.list" var="components"/>
<j:set var="pomDir" value="tmpPoms"/>
<mkdir dir="${pomDir}"/>
<j:forEach var="implementation" items="${implementations}">
+
+ <echo> implementation = '${implementation}' </echo>
+
<j:set var="component" value="${components.getProperty(implementation)}"/>
- <j:if test="${component != ''}">
+ <j:if test="${component.length() > 0}">
+
+ <echo> component = '${component}' </echo>
+
<get
src="http://www.ibiblio.org/maven/plexus/poms/${component}.pom"
dest="${pomDir}/${component}.pom"
@@ -184,7 +193,9 @@
name="classworlds-configuration"
description="Generate launcher configuration">
- <maven:pom projectDescriptor="${plugin.dir}/plexus.pom" var="project"/>
+ <maven:pom
+ projectDescriptor="${maven.plexus.pom}"
+ var="project"/>
<velocity:merge
name="${maven.plexus.conf}/${maven.plexus.launcherConfiguration}"
1.2 +3 -1 jakarta-turbine-maven/src/plugins-build/plexus/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/plexus/plugin.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.properties 24 Jan 2003 03:45:48 -0000 1.1
+++ plugin.properties 28 Jan 2003 05:06:47 -0000 1.2
@@ -5,7 +5,9 @@
# keep them apart from the project specific properties.
# -------------------------------------------------------------------
-maven.plexus.runtimeDirectory = ${basedir}/runtime
+maven.plexus.pom = ${maven.repo.local}/plexus/poms/plexus-0.2.pom
+
+maven.plexus.runtimeDirectory = ${maven.build.dir}/runtime
maven.plexus.bin = ${maven.plexus.runtimeDirectory}/bin
maven.plexus.conf = ${maven.plexus.runtimeDirectory}/conf
maven.plexus.log = ${maven.plexus.runtimeDirectory}/log
1.2 +14 -2 jakarta-turbine-maven/src/plugins-build/plexus/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/plexus/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 24 Jan 2003 03:45:47 -0000 1.1
+++ project.xml 28 Jan 2003 05:06:47 -0000 1.2
@@ -5,7 +5,7 @@
<pomVersion>3</pomVersion>
<id>maven-plexus-plugin</id>
<name>Maven Plexus Plug-in</name>
- <currentVersion>1.0</currentVersion>
+ <currentVersion>0.2</currentVersion>
<description>
Various goals for making development with Plexus easy.
@@ -179,7 +179,19 @@
<id>commons-betwixt</id>
<version>SNAPSHOT</version>
</dependency>
-
+
+ <!--
+ |
+ | The actual Plexus POM.
+ |
+ -->
+
+ <dependency>
+ <id>plexus</id>
+ <version>0.2</version>
+ <type>pom</type>
+ </dependency>
+
</dependencies>
1.2 +1 -1 jakarta-turbine-maven/src/plugins-build/plexus/src/plugin-resources/templates/classworlds.vm
Index: classworlds.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/plexus/src/plugin-resources/templates/classworlds.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- classworlds.vm 24 Jan 2003 03:45:50 -0000 1.1
+++ classworlds.vm 28 Jan 2003 05:06:47 -0000 1.2
@@ -6,4 +6,4 @@
load ${lib}/${jar.artifact}
#end
#end
-load ${lib}/${project.id}-${project.currentVersion}.jar
+load ${lib}/${project.artifactId}-${project.currentVersion}.jar