svn commit: r190057 - in /maven/maven-1/plugins/trunk/artifact/src: main/org/apache/maven/artifact/PomRewriter.java test/java/org/apache/maven/artifact/PomRewriterTest.java

[brett]

Author: brett
Date: Fri Jun 10 18:58:14 2005
New Revision: 190057

URL: http://svn.apache.org/viewcvs?rev=190057&view=rev
Log:
refactor call to make it simpler

Modified:
    
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/PomRewriter.java
    
maven/maven-1/plugins/trunk/artifact/src/test/java/org/apache/maven/artifact/PomRewriterTest.java

Modified: 
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/PomRewriter.java
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/PomRewriter.java?rev=190057&r1=190056&r2=190057&view=diff
==============================================================================
--- 
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/PomRewriter.java
 (original)
+++ 
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/PomRewriter.java
 Fri Jun 10 18:58:14 2005
@@ -19,6 +19,7 @@
 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 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 @@
         }
     }
 
-    static Model getRewrittenModel( Project project )
+    static Model getRewrittenModel( File file, JellyContext context )
         throws MavenException
     {
         Model model;
@@ -87,7 +88,7 @@
                                                                        
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 );

Modified: 
maven/maven-1/plugins/trunk/artifact/src/test/java/org/apache/maven/artifact/PomRewriterTest.java
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/artifact/src/test/java/org/apache/maven/artifact/PomRewriterTest.java?rev=190057&r1=190056&r2=190057&view=diff
==============================================================================
--- 
maven/maven-1/plugins/trunk/artifact/src/test/java/org/apache/maven/artifact/PomRewriterTest.java
 (original)
+++ 
maven/maven-1/plugins/trunk/artifact/src/test/java/org/apache/maven/artifact/PomRewriterTest.java
 Fri Jun 10 18:58:14 2005
@@ -37,9 +37,9 @@
     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 @@
         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 ) );
-    }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]