geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsis...@apache.org
Subject svn commit: r374366 - in /geronimo/trunk: etc/project.properties modules/installer-processing/src/java/org/apache/geronimo/installer/processing/FixTextLines.java plugins/geronimo-assembly-plugin/plugin.jelly plugins/geronimo-assembly-plugin/project.xml
Date Thu, 02 Feb 2006 11:37:49 GMT
Author: jsisson
Date: Thu Feb  2 03:37:23 2006
New Revision: 374366

URL: http://svn.apache.org/viewcvs?rev=374366&view=rev
Log:
GERONIMO-1278 - fix problem on windows where rename fails during fixcrlf processing in installer
(merged from 1.0 branch).

Modified:
    geronimo/trunk/etc/project.properties
    geronimo/trunk/modules/installer-processing/src/java/org/apache/geronimo/installer/processing/FixTextLines.java
    geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly
    geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml

Modified: geronimo/trunk/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/etc/project.properties?rev=374366&r1=374365&r2=374366&view=diff
==============================================================================
--- geronimo/trunk/etc/project.properties (original)
+++ geronimo/trunk/etc/project.properties Thu Feb  2 03:37:23 2006
@@ -86,7 +86,7 @@
 release_notes_version=1.0
 
 geronimo_packaging_plugin_version=1.1.3
-geronimo_assembly_plugin_version=1.1.6
+geronimo_assembly_plugin_version=1.1.7
 geronimo_deployment_plugin_version=1.1.1
 geronimo_dependency_plugin_version=1.1.1
 

Modified: geronimo/trunk/modules/installer-processing/src/java/org/apache/geronimo/installer/processing/FixTextLines.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/installer-processing/src/java/org/apache/geronimo/installer/processing/FixTextLines.java?rev=374366&r1=374365&r2=374366&view=diff
==============================================================================
--- geronimo/trunk/modules/installer-processing/src/java/org/apache/geronimo/installer/processing/FixTextLines.java
(original)
+++ geronimo/trunk/modules/installer-processing/src/java/org/apache/geronimo/installer/processing/FixTextLines.java
Thu Feb  2 03:37:23 2006
@@ -168,9 +168,14 @@
                   fErr = true;
                }
             }
+            else
+            {
+                System.err.println( "FixTextLines: " + originalName + " initial rename failed."
);
+                fErr = true;
+            }
          } catch( Exception e ) {
             System.err.println( "FixTextLines: Error moving files. " + file.getPath() );
-            fErr = true;
+            fErr = true;            
          }
       }
    }

Modified: geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly?rev=374366&r1=374365&r2=374366&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly (original)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly Thu Feb  2 03:37:23 2006
@@ -40,7 +40,6 @@
         </ant:copy>
         <ant:mkdir dir="${geronimo.assembly.dest}/var/config"/>
         <velocity:merge basedir="${geronimo.assembly.src}/var/config" template="config.xml"
name="${geronimo.assembly.dest}/var/config/config.xml"/>
-        <velocity:merge basedir="${geronimo.assembly.src}/var/config" template="config.xml"
name="${geronimo.assembly.dest}/var/config/config.xml.original"/>
     </goal>
 
     <goal name="assemble:assemble-lib">

Modified: geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml?rev=374366&r1=374365&r2=374366&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml (original)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml Thu Feb  2 03:37:23 2006
@@ -23,7 +23,7 @@
     <id>geronimo-assembly-plugin</id>
     <name>Geronimo :: Maven Assembly Plugin</name>
     <description>A plugin used to assemble a distribution of Geronimo</description>
-    <currentVersion>1.1.6</currentVersion>
+    <currentVersion>1.1.7</currentVersion>
 
     <dependencies>
         <dependency>



Mime
View raw message