[jboss-svn-commits] JBL Code SVN: r14483 - labs/jbossbuild/maven-plugins/trunk/maven-jboss-deploy-plugin/src/main/java/org/jboss/maven/plugins/deploy.

[jboss-svn-commits at lists.jboss.org]

Author: pgier
Date: 2007-08-23 11:07:06 -0400 (Thu, 23 Aug 2007)
New Revision: 14483

Modified:
   labs/jbossbuild/maven-plugins/trunk/maven-jboss-deploy-plugin/src/main/java/org/jboss/maven/plugins/deploy/JBossDeployMojo.java
Log:
Adding parameter to set the license added to component-info.xml.

Modified: labs/jbossbuild/maven-plugins/trunk/maven-jboss-deploy-plugin/src/main/java/org/jboss/maven/plugins/deploy/JBossDeployMojo.java
===================================================================
--- labs/jbossbuild/maven-plugins/trunk/maven-jboss-deploy-plugin/src/main/java/org/jboss/maven/plugins/deploy/JBossDeployMojo.java	2007-08-23 14:50:17 UTC (rev 14482)
+++ labs/jbossbuild/maven-plugins/trunk/maven-jboss-deploy-plugin/src/main/java/org/jboss/maven/plugins/deploy/JBossDeployMojo.java	2007-08-23 15:07:06 UTC (rev 14483)
@@ -60,15 +60,22 @@
    private org.apache.maven.model.Scm scm;
 
    /**
-    * License information.
+    * License information from the pom.xml.
     * @parameter expression="${project.licenses}"
     * @required
     * @readonly
     */
-   private List licenses;
+   private List pomLicenses;
 
-   //private org.apache.maven.model.License license;
+   /**
+    * Name of license to add to component-info.xml.  If no value is specified,
+    * then the first license from the pom.xml will be used.
+    * @parameter expression="${project.licenses}"
+    * @required
+    */
+   private String license;
 
+
    /**
     * The Maven Plugin Object
     *
@@ -128,7 +135,7 @@
     * 
     * @parameter
     */
-   private Set exports;
+   private Set<String> exports;
 
    /**
     * Main execution path of the plugin.  Generates component-info.xml, and copies jar files to repository location.
@@ -186,16 +193,21 @@
       evaluateVariable(compInfoTemplate, "project.name", componentId + "-component-info");
       evaluateVariable(compInfoTemplate, "component.id", componentId);
       evaluateVariable(compInfoTemplate, "project.version", project.getVersion());
-      if (licenses.size() == 0)
+      if (license != null && ( ! license.equals(""))) 
       {
-         getLog().warn("No license specified in pom.xml.  Default lgpl license will be used.");
+         evaluateVariable(compInfoTemplate, "project.license", license);
+      }
+      else if (pomLicenses.size() == 0)
+      {
+         getLog().warn("No license specified.  Default lgpl license will be used.");
          evaluateVariable(compInfoTemplate, "project.license", "lgpl");
       }
       else
       {
-         License firstLicense = (License) licenses.get(0);
+         License firstLicense = (License) pomLicenses.get(0);
          evaluateVariable(compInfoTemplate, "project.license", firstLicense.getName());
       }
+      
       if (project.getDescription() == null || project.getDescription().equals(""))
       {
          project.setDescription(project.getId());