svn commit: r425712 - /maven/components/branches/maven-2.0.x/maven-model-converter/src/main/java/org/apache/maven/model/converter/Maven1Converter.java

[evenisse]

Author: evenisse
Date: Wed Jul 26 04:45:49 2006
New Revision: 425712

URL: http://svn.apache.org/viewvc?rev=425712&view=rev
Log:
merge with rev 425711
add some getter/setter

Modified:
    
maven/components/branches/maven-2.0.x/maven-model-converter/src/main/java/org/apache/maven/model/converter/Maven1Converter.java

Modified: 
maven/components/branches/maven-2.0.x/maven-model-converter/src/main/java/org/apache/maven/model/converter/Maven1Converter.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-model-converter/src/main/java/org/apache/maven/model/converter/Maven1Converter.java?rev=425712&r1=425711&r2=425712&view=diff
==============================================================================
--- 
maven/components/branches/maven-2.0.x/maven-model-converter/src/main/java/org/apache/maven/model/converter/Maven1Converter.java
 (original)
+++ 
maven/components/branches/maven-2.0.x/maven-model-converter/src/main/java/org/apache/maven/model/converter/Maven1Converter.java
 Wed Jul 26 04:45:49 2006
@@ -51,8 +51,6 @@
 public class Maven1Converter
     extends AbstractLogEnabled
 {
-    private File basedir;
-
     /**
      * Available converters for specific plugin configurations
      *
@@ -67,14 +65,20 @@
      */
     private PluginRelocatorManager pluginRelocatorManager;
 
+    private File basedir;
+
+    private File outputdir;
+
+    private String fileName = "project.xml";
+
     public void execute()
         throws ProjectConverterException
     {
-        File projectxml = new File( basedir, "project.xml" );
+        File projectxml = new File( basedir, fileName );
 
         if ( !projectxml.exists() )
         {
-            throw new ProjectConverterException( "Missing project.xml in " + 
basedir.getAbsolutePath() );
+            throw new ProjectConverterException( "Missing " + fileName + " in 
" + basedir.getAbsolutePath() );
         }
 
         PomV3ToV4Translator translator = new PomV3ToV4Translator();
@@ -86,7 +90,7 @@
         }
         catch ( Exception e )
         {
-            throw new ProjectConverterException( "Exception caught while 
loading project.xml. " + e.getMessage(), e );
+            throw new ProjectConverterException( "Exception caught while 
loading " + fileName + ". " + e.getMessage(), e );
         }
 
         Model v4Model;
@@ -97,7 +101,7 @@
         }
         catch ( Exception e )
         {
-            throw new ProjectConverterException( "Exception caught while 
converting project.xml. " + e.getMessage(),
+            throw new ProjectConverterException( "Exception caught while 
converting " + fileName + ". " + e.getMessage(),
                                                  e );
         }
 
@@ -254,11 +258,16 @@
     private void writeV4Pom( Model v4Model )
         throws ProjectConverterException
     {
-        File pomxml = new File( basedir, "pom.xml" );
+        if ( outputdir == null )
+        {
+            outputdir = basedir;
+        }
+
+        File pomxml = new File( outputdir, "pom.xml" );
 
         if ( pomxml.exists() )
         {
-            getLogger().warn( "pom.xml in " + basedir.getAbsolutePath() + " 
already exists, overwriting" );
+            getLogger().warn( "pom.xml in " + outputdir.getAbsolutePath() + " 
already exists, overwriting" );
         }
 
         MavenXpp3Writer v4Writer = new MavenXpp3Writer();
@@ -291,5 +300,34 @@
     public void setBasedir( File basedir )
     {
         this.basedir = basedir;
+    }
+
+    public String getProjectFileName()
+    {
+        return fileName;
+    }
+
+    public void setProjectFileName( String projectFileName )
+    {
+        this.fileName = projectFileName;
+    }
+
+    public void setProjectFile( File projectFile )
+    {
+        if ( projectFile != null )
+        {
+            basedir = projectFile.getParentFile();
+            fileName = projectFile.getName();
+        }
+    }
+
+    public File getOutputdir()
+    {
+        return outputdir;
+    }
+
+    public void setOutputdir( File outputdir )
+    {
+        this.outputdir = outputdir;
     }
 }