geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r420668 - in /geronimo/sandbox/svkmerge/m2migration: configs/pom.xml m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilderShellMojo.java
Date Tue, 11 Jul 2006 00:36:54 GMT
Author: jdillon
Date: Mon Jul 10 17:36:54 2006
New Revision: 420668

URL: http://svn.apache.org/viewvc?rev=420668&view=rev
Log:
Delete the target repository before running to prevent failures when re-building
Don't need to pre-clean anymore

Modified:
    geronimo/sandbox/svkmerge/m2migration/configs/pom.xml
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilderShellMojo.java

Modified: geronimo/sandbox/svkmerge/m2migration/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/pom.xml?rev=420668&r1=420667&r2=420668&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/pom.xml Mon Jul 10 17:36:54 2006
@@ -94,26 +94,11 @@
         </pluginManagement>
         
         <plugins>
-            <!--
-               | NOTE: Currently to build CAR files, we need to ensure that the module has
been cleaned first
-               |       otherwise the second time around the build will fail.
-             -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-clean-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>clean</goal>
-                        </goals>
-                        <phase>validate</phase>
-                    </execution>
-                </executions>
-            </plugin>
-            
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>geronimo-packaging-plugin</artifactId>
+                
+                <!-- Install as extention to allow 'car' packaging to be used. -->
                 <extensions>true</extensions>
             </plugin>
         </plugins>

Modified: geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilderShellMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilderShellMojo.java?rev=420668&r1=420667&r2=420668&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilderShellMojo.java
(original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilderShellMojo.java
Mon Jul 10 17:36:54 2006
@@ -31,6 +31,8 @@
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.project.MavenProject;
 
+import org.codehaus.plexus.util.FileUtils;
+
 //
 // TODO: Rename to PackageMojo
 //
@@ -154,8 +156,10 @@
     private boolean boot = false;
 
     protected void doExecute() throws Exception {
-        targetRepository.mkdir();
-
+        // We need to make sure to clean up any previous work first or this operation will
fail
+        FileUtils.forceDelete(targetRepository);
+        FileUtils.forceMkdir(targetRepository);
+        
         if (boot) {
             executeBootShell();
         }
@@ -242,8 +246,6 @@
     }
 
     private void set(String methodName, Object value, Class type, Object packageBuilder)
throws Exception {
-        Log log = getLog();
-        
         log.debug("Setting (" + methodName + "): " + value);
 
         try {



Mime
View raw message