From 4d4f02f2e4afdd161dbbb514a90dea137a1d51dc Mon Sep 17 00:00:00 2001
From: brett <brett@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 11 Jun 2005 01:58:14 +0000
Subject: [PATCH] refactor call to make it simpler

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@190057 13f79535-47bb-0310-9956-ffa450edef68
---
 .../main/org/apache/maven/artifact/PomRewriter.java    |  7 ++++---
 .../org/apache/maven/artifact/PomRewriterTest.java     | 10 ++--------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/artifact/src/main/org/apache/maven/artifact/PomRewriter.java b/artifact/src/main/org/apache/maven/artifact/PomRewriter.java
index 06b54b6b..0082777f 100644
--- a/artifact/src/main/org/apache/maven/artifact/PomRewriter.java
+++ b/artifact/src/main/org/apache/maven/artifact/PomRewriter.java
@@ -19,6 +19,7 @@ package org.apache.maven.artifact;
 import org.apache.commons.betwixt.XMLIntrospector;
 import org.apache.commons.betwixt.io.BeanWriter;
 import org.apache.commons.betwixt.strategy.DecapitalizeNameMapper;
+import org.apache.commons.jelly.JellyContext;
 import org.apache.maven.MavenException;
 import org.apache.maven.MavenUtils;
 import org.apache.maven.jelly.MavenJellyContext;
@@ -51,7 +52,7 @@ public class PomRewriter
     public static File getRewrittenPom( Project project )
         throws MavenException
     {
-        Model model = getRewrittenModel( project );
+        Model model = getRewrittenModel( project.getFile(), project.getContext() );
 
         FileWriter w = null;
         try
@@ -74,7 +75,7 @@ public class PomRewriter
         }
     }
 
-    static Model getRewrittenModel( Project project )
+    static Model getRewrittenModel( File file, JellyContext context )
         throws MavenException
     {
         Model model;
@@ -87,7 +88,7 @@ public class PomRewriter
                                                                        boolean.class} );
             m.setAccessible( true );
             Project p = (Project) m.invoke( null,
-                                            new Object[]{project.getFile(), project.getContext(), Boolean.TRUE} );
+                                            new Object[]{file, context, Boolean.TRUE} );
             m.setAccessible( false );
             m = MavenUtils.class.getDeclaredMethod( "getJellyProject", new Class[]{Project.class} );
             m.setAccessible( true );
diff --git a/artifact/src/test/java/org/apache/maven/artifact/PomRewriterTest.java b/artifact/src/test/java/org/apache/maven/artifact/PomRewriterTest.java
index 9c7f9cc3..e7205cfc 100644
--- a/artifact/src/test/java/org/apache/maven/artifact/PomRewriterTest.java
+++ b/artifact/src/test/java/org/apache/maven/artifact/PomRewriterTest.java
@@ -37,9 +37,9 @@ public class PomRewriterTest
     public void testPropertiesRewriting()
         throws MavenException
     {
-        Project project = getProject( "pom-with-properties.xml" );
+        String resourceName = "pom-with-properties.xml";
 
-        Model model = PomRewriter.getRewrittenModel( project );
+        Model model = PomRewriter.getRewrittenModel( new File( System.getProperty( "basedir"), "src/test/resources/" + resourceName ), null );
 
         Dependency dep = (Dependency) model.getDependencies().get( 0 );
         assertEquals( "check property war.bundle", "true", dep.getProperty( "war.bundle" ) );
@@ -51,10 +51,4 @@ public class PomRewriterTest
         assertEquals( "check num properties", 2, dep.getProperties().size() );
     }
 
-    private static Project getProject( String resourceName )
-        throws MavenException
-    {
-        // TODO: use a resource if MavenUtils supported it
-        return MavenUtils.getProject( new File( System.getProperty( "basedir"), "src/test/resources/" + resourceName ) );
-    }
 }