You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by lt...@apache.org on 2005/09/27 23:58:55 UTC

svn commit: r292059 - in /maven/maven-1/plugins/trunk/plugin: plugin.jelly plugin.properties xdocs/changes.xml xdocs/goals.xml xdocs/properties.xml

Author: ltheussl
Date: Tue Sep 27 14:58:53 2005
New Revision: 292059

URL: http://svn.apache.org/viewcvs?rev=292059&view=rev
Log:
MPPLUGIN-33: Allow plugin-test directory to be changed

Added:
    maven/maven-1/plugins/trunk/plugin/plugin.properties
Modified:
    maven/maven-1/plugins/trunk/plugin/plugin.jelly
    maven/maven-1/plugins/trunk/plugin/xdocs/changes.xml
    maven/maven-1/plugins/trunk/plugin/xdocs/goals.xml
    maven/maven-1/plugins/trunk/plugin/xdocs/properties.xml

Modified: maven/maven-1/plugins/trunk/plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/plugin/plugin.jelly?rev=292059&r1=292058&r2=292059&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/plugin/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/plugin/plugin.jelly Tue Sep 27 14:58:53 2005
@@ -477,9 +477,9 @@
     
   <!-- test a plugin -->
   <goal name="plugin:test" description="Run a plugin's test project">
-    <u:available file="${basedir}/src/plugin-test/project.xml">
+    <u:available file="${basedir}/${maven.plugin.test.dir}/project.xml">
       <maven:maven
-        descriptor="${basedir}/src/plugin-test/project.xml"
+        descriptor="${basedir}/${maven.plugin.test.dir}/project.xml"
         goals="testPlugin"
         ignoreFailures="false" />
     </u:available>

Added: maven/maven-1/plugins/trunk/plugin/plugin.properties
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/plugin/plugin.properties?rev=292059&view=auto
==============================================================================
--- maven/maven-1/plugins/trunk/plugin/plugin.properties (added)
+++ maven/maven-1/plugins/trunk/plugin/plugin.properties Tue Sep 27 14:58:53 2005
@@ -0,0 +1,23 @@
+# -------------------------------------------------------------------
+# Copyright 2001-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.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+#  
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -------------------------------------------------------------------
+
+# -------------------------------------------------------------------
+# P L U G I N  P R O P E R T I E S
+# -------------------------------------------------------------------
+# Plugin plugin.
+# -------------------------------------------------------------------
+
+maven.plugin.test.dir=src/plugin-test

Modified: maven/maven-1/plugins/trunk/plugin/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/plugin/xdocs/changes.xml?rev=292059&r1=292058&r2=292059&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/plugin/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/plugin/xdocs/changes.xml Tue Sep 27 14:58:53 2005
@@ -24,6 +24,7 @@
   </properties>
   <body>
     <release version="1.7-SNAPSHOT" date="In SVN">
+      <action dev="ltheussl" type="add" issue="MPPLUGIN-33">Allow plugin-test directory to be changed.</action>
       <action dev="ltheussl" type="fix" issue="MPPLUGIN-25" due-to="Jamie McCrindle, Barrie Treloar">NTLM Proxy Problem.</action>
       <action dev="carlos" type="fix" issue="MPPLUGIN-26">plugin:download didn't redownload SNAPSHOT plugins.</action>
       <action dev="ltheussl" type="add">new plugin:validate-xml tag to validate xml documents against a schema.</action>

Modified: maven/maven-1/plugins/trunk/plugin/xdocs/goals.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/plugin/xdocs/goals.xml?rev=292059&r1=292058&r2=292059&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/plugin/xdocs/goals.xml (original)
+++ maven/maven-1/plugins/trunk/plugin/xdocs/goals.xml Tue Sep 27 14:58:53 2005
@@ -90,7 +90,13 @@
       </goal>
       <goal>
         <name>plugin:test</name>
-        <description>Run a plugin's test project</description>
+        <description>
+          Run a plugin's test project by executing maven with a goal called
+          <code>testPlugin</code> in <code>${maven.plugin.test.dir}</code>.
+          This directory should contain a <code>project.xml</code> project
+          descriptor and a custom <code>maven.xml</code> file that
+          defines the goal.
+        </description>
       </goal>
       <goal>
         <name>plugin:repository-install</name>

Modified: maven/maven-1/plugins/trunk/plugin/xdocs/properties.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/plugin/xdocs/properties.xml?rev=292059&r1=292058&r2=292059&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/plugin/xdocs/properties.xml (original)
+++ maven/maven-1/plugins/trunk/plugin/xdocs/properties.xml Tue Sep 27 14:58:53 2005
@@ -32,6 +32,16 @@
           <th>Description</th>
         </tr>
         <tr>
+          <td>maven.plugin.test.dir</td>
+          <td>Yes</td>
+          <td>
+            The directory that contains the project descriptor for
+            running the plugin tests. This should be relative to
+            <code>${basedir}</code>.
+            Default is <code>src/plugin-test</code>.
+          </td>
+        </tr>
+        <tr>
           <td>maven.docs.src</td>
           <td>Yes</td>
           <td>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org