You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ra...@apache.org on 2008/03/13 23:46:03 UTC

svn commit: r636908 - in /maven/archetype/trunk: archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetype.java archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java

Author: rafale
Date: Thu Mar 13 15:45:53 2008
New Revision: 636908

URL: http://svn.apache.org/viewvc?rev=636908&view=rev
Log:
Fix for issue ARCHETYPE-146
Project generation of Archetype created on windows now works.

Modified:
    maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetype.java
    maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java

Modified: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetype.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetype.java?rev=636908&r1=636907&r2=636908&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetype.java (original)
+++ maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetype.java Thu Mar 13 15:45:53 2008
@@ -125,6 +125,8 @@
             else
             {
                 String fileName = files[i].getAbsolutePath().substring( offset + 1 );
+                
+                if(File.separatorChar != '/'){ fileName = fileName.replace('\\', '/'); }
 
                 ZipEntry e = new ZipEntry( fileName );
 

Modified: maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java?rev=636908&r1=636907&r2=636908&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java (original)
+++ maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java Thu Mar 13 15:45:53 2008
@@ -32,7 +32,7 @@
 import org.apache.maven.project.MavenProject;
 
 import java.io.File;
-import java.io.FileReader;
+import java.io.FileInputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -246,7 +246,7 @@
             try
             {
                 Properties properties = new Properties();
-                properties.load( new FileReader( propertyFile ) );
+                properties.load( new FileInputStream( propertyFile ) );
 
                 String extensions =
                     properties.getProperty( Constants.ARCHETYPE_FILTERED_EXTENSIONS );
@@ -287,7 +287,7 @@
             try
             {
                 Properties properties = new Properties();
-                properties.load( new FileReader( propertyFile ) );
+                properties.load( new FileInputStream( propertyFile ) );
 
                 String languages =
                     properties.getProperty( Constants.ARCHETYPE_LANGUAGES );