[jboss-svn-commits] JBL Code SVN: r12505 - 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-06-12 14:45:20 -0400 (Tue, 12 Jun 2007)
New Revision: 12505

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:
Update parent pom version.
Change . to / for groupId in the component-info file

Modified: labs/jbossbuild/maven-plugins/trunk/jboss-deploy-maven-plugin/pom.xml
===================================================================
--- labs/jbossbuild/maven-plugins/trunk/jboss-deploy-maven-plugin/pom.xml	2007-06-12 18:21:07 UTC (rev 12504)
+++ labs/jbossbuild/maven-plugins/trunk/jboss-deploy-maven-plugin/pom.xml	2007-06-12 18:45:20 UTC (rev 12505)
@@ -1,8 +1,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>jboss</groupId>
+    <groupId>org.jboss</groupId>
     <artifactId>jboss-parent</artifactId>
-    <version>2</version>
+    <version>3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jboss.maven.plugins</groupId>

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-06-12 18:21:07 UTC (rev 12504)
+++ labs/jbossbuild/maven-plugins/trunk/jboss-deploy-maven-plugin/src/main/java/org/jboss/maven/plugins/deploy/JBossDeployMojo.java	2007-06-12 18:45:20 UTC (rev 12505)
@@ -141,9 +141,9 @@
       if (exports == null) {
          exports = new HashSet<String>();
       }
-      
+      String jbossGroupId = project.getGroupId().replace('.', '/');
       // Initialize some local variables
-      File deployToDir = new File(jbossDeployRoot + fileSep + project.getGroupId().replace('.', '/') + fileSep
+      File deployToDir = new File(jbossDeployRoot + fileSep + jbossGroupId + fileSep
             + project.getArtifactId() + fileSep + project.getVersion() + fileSep);
       File deployToLibDir = new File(deployToDir.getAbsolutePath() + fileSep + "lib" + fileSep);
 
@@ -170,7 +170,7 @@
       }
 
       // Evaluate the place holders in the template
-      String componentId = project.getGroupId() + "/" + project.getArtifactId();
+      String componentId = jbossGroupId + "/" + project.getArtifactId();
       evaluateVariable(compInfoTemplate, "project.name", componentId + "-component-info");
       evaluateVariable(compInfoTemplate, "component.id", componentId);
       evaluateVariable(compInfoTemplate, "project.version", project.getVersion());