svn commit: r1383078 - in /maven/plugins/trunk/maven-rar-plugin: pom.xml src/main/java/org/apache/maven/plugin/rar/RarMojo.java

[ol...@apache.org]

Author: olamy
Date: Mon Sep 10 19:40:15 2012
New Revision: 1383078

URL: http://svn.apache.org/viewvc?rev=1383078&view=rev
Log:
[MRAR-29] Make ra.xml optional - 1.6 spec
Submitted by Kresimir Kovac.

Modified:
    maven/plugins/trunk/maven-rar-plugin/pom.xml
    maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java

Modified: maven/plugins/trunk/maven-rar-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/pom.xml?rev=1383078&r1=1383077&r2=1383078&view=diff
==============================================================================
--- maven/plugins/trunk/maven-rar-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-rar-plugin/pom.xml Mon Sep 10 19:40:15 2012
@@ -150,6 +150,7 @@ under the License.
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-invoker-plugin</artifactId>
+              <version>1.7</version>
               <configuration>
                 <debug>true</debug>
                 <projectsDirectory>src/it</projectsDirectory>

Modified: maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java?rev=1383078&r1=1383077&r2=1383078&view=diff
==============================================================================
--- maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java (original)
+++ maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java Mon Sep 10 19:40:15 2012
@@ -255,6 +255,17 @@ public class RarMojo
     @Parameter
     protected List<RarResource> rarResources;
 
+
+    /**
+     * Whether or not warn if the <code>ra.xml</code> file is missing. Set to <code>false</code>
+     * if you want you RAR built without a <code>ra.xml</code> file.
+     * This may be useful if you are building against JCA 1.6 or later.
+     *
+     * @since 2.3
+     */
+    @Parameter( property = "warnOnMissingRaXml", defaultValue = "true" )
+    protected boolean warnOnMissingRaXml = true;
+
     private File buildDir;
 
 
@@ -388,7 +399,7 @@ public class RarMojo
 
         // Check if connector deployment descriptor is there
         File ddFile = new File( getBuildDir(), RA_XML_URI );
-        if ( !ddFile.exists() )
+        if ( !ddFile.exists() && warnOnMissingRaXml )
         {
             getLog().warn( "Connector deployment descriptor: " + ddFile.getAbsolutePath() + " does not exist." );
         }