[jboss-svn-commits] JBL Code SVN: r10232 - in labs/jbossbuild/maven-plugins/trunk/jboss-deploy-maven-plugin: src/main/java/org/jboss/maven/plugins/deploy and 1 other directory.

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

Author: pgier
Date: 2007-03-15 12:27:06 -0400 (Thu, 15 Mar 2007)
New Revision: 10232

Modified:
   labs/jbossbuild/maven-plugins/trunk/jboss-deploy-maven-plugin/pom.xml
   labs/jbossbuild/maven-plugins/trunk/jboss-deploy-maven-plugin/src/main/java/org/jboss/maven/plugins/deploy/JBossDeployMojo.java
Log:
Moved the tagBase in the pom.xml to the release plugin config instead of in a generic property.
Made some changes related to the imports and exports in the generated component-info.xml.

Modified: labs/jbossbuild/maven-plugins/trunk/jboss-deploy-maven-plugin/pom.xml
===================================================================
--- labs/jbossbuild/maven-plugins/trunk/jboss-deploy-maven-plugin/pom.xml	2007-03-15 15:17:59 UTC (rev 10231)
+++ labs/jbossbuild/maven-plugins/trunk/jboss-deploy-maven-plugin/pom.xml	2007-03-15 16:27:06 UTC (rev 10232)
@@ -25,6 +25,12 @@
           <target>1.5</target>
         </configuration>
       </plugin>
+      <plugin>
+        <artifactId>maven-release-plugin</artifactId>
+        <configuration>
+          <tagBase>https://svn.labs.jboss.org/labs/jbossbuild/maven-plugins/tags</tagBase>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
   <repositories>
@@ -57,7 +63,4 @@
       <version>2.0</version>
     </dependency>
   </dependencies>
-  <properties>
-    <tagBase>https://svn.labs.jboss.org/labs/jbossbuild/maven-plugins/tags</tagBase>
-  </properties>
 </project>
\ No newline at end of file

Modified: labs/jbossbuild/maven-plugins/trunk/jboss-deploy-maven-plugin/src/main/java/org/jboss/maven/plugins/deploy/JBossDeployMojo.java
===================================================================
--- labs/jbossbuild/maven-plugins/trunk/jboss-deploy-maven-plugin/src/main/java/org/jboss/maven/plugins/deploy/JBossDeployMojo.java	2007-03-15 15:17:59 UTC (rev 10231)
+++ labs/jbossbuild/maven-plugins/trunk/jboss-deploy-maven-plugin/src/main/java/org/jboss/maven/plugins/deploy/JBossDeployMojo.java	2007-03-15 16:27:06 UTC (rev 10232)
@@ -113,16 +113,16 @@
    private String jbossDeployRoot;
 
    /**
-    * This is the list of components that this project depends on.
+    * This is the map of components that this project depends on.
     * @parameter
     */
-   private Map importsParam;
+   private Map imports;
 
    /**
     * This is the list of artifacts to be added to the classpath.
     * @parameter
     */
-   private List exportsParam;
+   private List exports;
 
    /**
     * Main execution path of the plugin.  Generates component-info.xml, and copies jar files to repository location.
@@ -228,31 +228,36 @@
       evaluateVariable(compInfoTemplate, "artifacts", artifacts.toString());
 
       // Create and set list of includes
-      StringBuffer includes = new StringBuffer();
-      includes.append("      <include input=\"" + artifactFileName + "\"/>");
-      evaluateVariable(compInfoTemplate, "includes", includes.toString());
+      StringBuffer exportsString = new StringBuffer();
+      exportsString.append("      <include input=\"" + artifactFileName + "\"/>\n");
+      if (exports!=null) {
+         for(Object export : exports) {
+            exportsString.append("      <include input=\"" + export + "\"/>\n");
+         }
+      }
+      evaluateVariable(compInfoTemplate, "includes", exportsString.toString());
 
       // Get list of imports
       //TODO: Maybe this can be determined based on the dependencies, but for now we just have to set it 
       //      in the plugin configuration 
       //      List dependencies = project.getDependencies();
-      if (importsParam == null)
+      if (imports == null)
       {
          evaluateVariable(compInfoTemplate, "imports", "");
       }
       else
       {
-         StringBuffer imports = new StringBuffer();
-         Set componentNames = importsParam.keySet();
+         StringBuffer importsString = new StringBuffer();
+         Set componentNames = imports.keySet();
          for (Object component : componentNames)
          {
-            imports.append("    <import componentref=\"" + component + "\">\n");
-            imports.append("      <compatible version=\"" + importsParam.get(component) + "\"/>\n");
-            imports.append("    </import>\n");
+            importsString.append("    <import componentref=\"" + component + "\">\n");
+            importsString.append("      <compatible version=\"" + imports.get(component) + "\"/>\n");
+            importsString.append("    </import>\n");
          }
-         evaluateVariable(compInfoTemplate, "imports", imports.toString());
+         evaluateVariable(compInfoTemplate, "imports", importsString.toString());
       }
-
+      
       // Write the component info file
       try
       {