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

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

Author: pgier
Date: 2007-03-30 14:31:31 -0400 (Fri, 30 Mar 2007)
New Revision: 10655

Modified:
   labs/jbossbuild/maven-plugins/trunk/jboss-retro-maven-plugin/pom.xml
   labs/jbossbuild/maven-plugins/trunk/jboss-retro-maven-plugin/src/main/java/org/jboss/maven/plugins/retro/RetroMojo.java
Log:
Working on retro check functionality.

Modified: labs/jbossbuild/maven-plugins/trunk/jboss-retro-maven-plugin/pom.xml
===================================================================
--- labs/jbossbuild/maven-plugins/trunk/jboss-retro-maven-plugin/pom.xml	2007-03-30 17:33:37 UTC (rev 10654)
+++ labs/jbossbuild/maven-plugins/trunk/jboss-retro-maven-plugin/pom.xml	2007-03-30 18:31:31 UTC (rev 10655)
@@ -56,7 +56,7 @@
     <dependency>
       <groupId>jboss</groupId>
       <artifactId>jbossretro</artifactId>
-      <version>1.0.5.beta</version>
+      <version>1.0.5.GA</version>
     </dependency>
     <dependency>
       <groupId>org.apache.ant</groupId>

Modified: labs/jbossbuild/maven-plugins/trunk/jboss-retro-maven-plugin/src/main/java/org/jboss/maven/plugins/retro/RetroMojo.java
===================================================================
--- labs/jbossbuild/maven-plugins/trunk/jboss-retro-maven-plugin/src/main/java/org/jboss/maven/plugins/retro/RetroMojo.java	2007-03-30 17:33:37 UTC (rev 10654)
+++ labs/jbossbuild/maven-plugins/trunk/jboss-retro-maven-plugin/src/main/java/org/jboss/maven/plugins/retro/RetroMojo.java	2007-03-30 18:31:31 UTC (rev 10655)
@@ -134,9 +134,10 @@
          argsList.add("-suppress");
       }
       argsList.add("-destdir");
+      String fileSep = System.getProperty("file.separator");
       try
       {
-         argsList.add(targetDirectory.getCanonicalPath() + "/classes-retro");
+         argsList.add(targetDirectory.getCanonicalPath() + fileSep + "classes-retro/");
       }
       catch (Exception e)
       {
@@ -197,16 +198,19 @@
 
       // Create jar file and attach it to maven.
       File retroJarFile = new File(targetDirectory.getAbsolutePath() + "/" + project.getArtifactId() + "-jdk14.jar");
-      createJarEntries();
-      createRetroJarFile(retroJarFile);
-      projectHelper.attachArtifact(project, retroJarFile, "jdk14");
+      File retroClassesDir = new File(targetDirectory.getAbsolutePath() + "/classes-retro");
+      if (retroClassesDir.exists()) {
+         createJarEntries(retroClassesDir);
+         createRetroJarFile(retroJarFile);
+         projectHelper.attachArtifact(project, retroJarFile, "jdk14");
+      }
    }
 
-   private void createJarEntries()
+   private void createJarEntries(File retroClassesDir)
    {
       try
       {
-         File retroClassesDir = new File(targetDirectory.getAbsolutePath() + "/classes-retro");
+         this.getLog().info("DEBUG: " + retroClassesDir.getAbsolutePath());
          Collection retroClasses = FileUtils.listFiles(retroClassesDir, null, true);
          for (Object classFile : retroClasses)
          {