Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor call to make it simpler

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@190057 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
brett
2005-06-11 01:58:14 +00:00
parent d5c0325885
commit 4d4f02f2e4
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
artifact/src/main/org/apache/maven/artifact/PomRewriter.java
View File

@@ -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 );

10
artifact/src/test/java/org/apache/maven/artifact/PomRewriterTest.java
View File

@@ -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 ) );
}
}