You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by vm...@apache.org on 2004/08/17 17:11:16 UTC
cvs commit: maven-plugins/abbot/xdocs changes.xml properties.xml
vmassol 2004/08/17 08:11:16
Modified: abbot plugin.jelly project.xml plugin.properties
abbot/xdocs changes.xml properties.xml
Log:
Added new <code>maven.abbot.extrajars</code> property that can be used to specify extra jars to be added to the executing classpath. For example, this is useful to add custom Abbot tester classes.
Revision Changes Path
1.6 +21 -2 maven-plugins/abbot/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/abbot/plugin.jelly,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin.jelly 17 Aug 2004 13:54:11 -0000 1.5
+++ plugin.jelly 17 Aug 2004 15:11:15 -0000 1.6
@@ -171,6 +171,19 @@
</j:forEach>
+ <!-- Also sign all user-specified extra jars to be added to the executing CP.
+ Note: The reason these jars are not passed as tagged dependencies is because
+ we need to be able to specify them from another plugin. -->
+ <u:tokenize var="customJars" delim=",">${maven.abbot.extrajars}</u:tokenize>
+ <j:forEach var="customJar" items="${customJars}">
+ <ant:basename property="jarname" file="${customJar}"/>
+ <copy todir="${maven.abbot.dest.jar.dir}" file="${customJar}"/>
+ <signjar jar="${maven.abbot.dest.jar.dir}/${jarname}"
+ keystore="${maven.abbot.sign.keystore}"
+ alias="${maven.abbot.sign.alias}"
+ storepass="${maven.abbot.sign.storepass}"/>
+ </j:forEach>
+
<!-- Jar containing abbot main class is signed -->
<!-- TODO: Only sign it if not already done instead of everytime -->
<signjar jar="${maven.abbot.dest.jar.dir}/${maven.abbot.webstart.main.jar}"
@@ -206,8 +219,7 @@
<arg value="${maven.abbot.dest.dir}/${maven.abbot.webstart.jnlp.modified}"/>
</java>
- </goal>
-
+ </goal>
<!--
========================================================================
@@ -271,6 +283,13 @@
<x:set var="jarname" select="string($jar/@href)"/>
<pathelement path="${maven.abbot.dest.dir}/${jarname}"/>
</x:forEach>
+
+ <!-- Extra dependencies -->
+ <u:tokenize var="customJars" delim=",">${maven.abbot.extrajars}</u:tokenize>
+ <j:forEach var="customJar" items="${customJars}">
+ <pathelement location="${customjar}"/>
+ </j:forEach>
+
</classpath>
</java>
1.10 +1 -1 maven-plugins/abbot/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/abbot/project.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.xml 8 Jul 2004 09:50:45 -0000 1.9
+++ project.xml 17 Aug 2004 15:11:15 -0000 1.10
@@ -23,7 +23,7 @@
<pomVersion>3</pomVersion>
<id>maven-abbot-plugin</id>
<name>Maven Abbot plugin</name>
- <currentVersion>1.0</currentVersion>
+ <currentVersion>1.1-SNAPSHOT</currentVersion>
<description>Run Abbot tests</description>
<shortDescription>Abbot Tests</shortDescription>
<url>http://maven.apache.org/reference/plugins/abbot/</url>
1.3 +5 -0 maven-plugins/abbot/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven-plugins/abbot/plugin.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.properties 17 Aug 2004 13:54:11 -0000 1.2
+++ plugin.properties 17 Aug 2004 15:11:15 -0000 1.3
@@ -92,3 +92,8 @@
# from the local file system we need to have the permissions and thus we
# need signed jars to get these permissions.
maven.abbot.sign = true
+
+# Extra list of jars (separated by commas) to be added to the generated JNLP
+# and to the executing CP for the editor goal. This is useful for example when
+# creating custom Abbot testers that need to be included in the executing CP.
+#maven.abbot.extrajars =
\ No newline at end of file
1.4 +7 -0 maven-plugins/abbot/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/abbot/xdocs/changes.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- changes.xml 8 Jul 2004 09:36:35 -0000 1.3
+++ changes.xml 17 Aug 2004 15:11:16 -0000 1.4
@@ -6,6 +6,13 @@
<author email="vmassol@apache.org">Vincent Massol</author>
</properties>
<body>
+ <release version="1.1-SNAPSHOT" date="in CVS">
+ <action dev="vmassol" type="add">
+ Added new <code>maven.abbot.extrajars</code> property that can be used
+ to specify extra jars to be added to the executing classpath. For example,
+ this is useful to add custom Abbot tester classes.
+ </action>
+ </release>
<release version="1.0" date="2004-07-08">
<action dev="vmassol" type="add">Initial creation by Christian Blavier and Vincent Massol. See the feature list on the Abbot plugin web site for a full list of what the plugin does.</action>
</release>
1.2 +9 -0 maven-plugins/abbot/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven-plugins/abbot/xdocs/properties.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- properties.xml 12 Jun 2004 14:10:25 -0000 1.1
+++ properties.xml 17 Aug 2004 15:11:16 -0000 1.2
@@ -27,6 +27,10 @@
# Location where the abbot plugin puts build files related to abbot
maven.abbot.dest.dir = ${maven.build.dir}/abbot
+# Location where the abbot plugin signs the jars to be added to the
+# generated JNLP file.
+maven.abbot.dest.jar.dir = ${maven.abbot.dest.dir}/jars
+
# Location where abbot junit test results will be located
maven.abbot.reports.dir = ${maven.build.dir}/abbot-reports
@@ -82,6 +86,11 @@
# from the local file system we need to have the permissions and thus we
# need signed jars to get these permissions.
maven.abbot.sign = true
+
+# Extra list of jars (separated by commas) to be added to the generated JNLP
+# and to the executing CP for the editor goal. This is useful for example when
+# creating custom Abbot testers that need to be included in the executing CP.
+#maven.abbot.extrajars =
]]></source>
</section>
</body>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org