From ef5b83bf3608e9a4bfb105f57ceae646e6e26fe0 Mon Sep 17 00:00:00 2001
From: vmassol <vmassol@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 17 Aug 2004 15:11:16 +0000
Subject: [PATCH] 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.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115973 13f79535-47bb-0310-9956-ffa450edef68
---
 abbot/plugin.jelly         | 23 +++++++++++++++++++++--
 abbot/plugin.properties    |  5 +++++
 abbot/project.xml          |  2 +-
 abbot/xdocs/changes.xml    |  7 +++++++
 abbot/xdocs/properties.xml |  9 +++++++++
 5 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/abbot/plugin.jelly b/abbot/plugin.jelly
index cca5095b..92a54b6f 100644
--- a/abbot/plugin.jelly
+++ b/abbot/plugin.jelly
@@ -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>
   
diff --git a/abbot/plugin.properties b/abbot/plugin.properties
index 04672ae9..5d76a082 100644
--- a/abbot/plugin.properties
+++ b/abbot/plugin.properties
@@ -92,3 +92,8 @@ maven.abbot.webstart.main.class = org.apache.maven.abbot.AbbotWebstartTestRunner
 # 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
diff --git a/abbot/project.xml b/abbot/project.xml
index 59d2431d..98ca6c14 100644
--- a/abbot/project.xml
+++ b/abbot/project.xml
@@ -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>
diff --git a/abbot/xdocs/changes.xml b/abbot/xdocs/changes.xml
index 92030f8a..1c4f3f1b 100644
--- a/abbot/xdocs/changes.xml
+++ b/abbot/xdocs/changes.xml
@@ -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>
diff --git a/abbot/xdocs/properties.xml b/abbot/xdocs/properties.xml
index 9bd49971..53676264 100644
--- a/abbot/xdocs/properties.xml
+++ b/abbot/xdocs/properties.xml
@@ -27,6 +27,10 @@ maven.abbot.recurse = true
 # 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 @@ maven.abbot.webstart.main.class = org.apache.maven.abbot.AbbotWebstartTestRunner
 # 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>