Author: jvanzyl Date: Sun Apr 26 22:41:53 2009 New Revision: 768820 URL: http://svn.apache.org/viewvc?rev=768820&view=rev Log: o jxpath is not needed except for testing in my branch which i will merge shortly
Modified: maven/components/trunk/maven-core/pom.xml maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java Modified: maven/components/trunk/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/pom.xml?rev=768820&r1=768819&r2=768820&view=diff ============================================================================== --- maven/components/trunk/maven-core/pom.xml (original) +++ maven/components/trunk/maven-core/pom.xml Sun Apr 26 22:41:53 2009 @@ -97,6 +97,7 @@ <dependency> <groupId>commons-jxpath</groupId> <artifactId>commons-jxpath</artifactId> + <scope>test</scope> </dependency> </dependencies> Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=768820&r1=768819&r2=768820&view=diff ============================================================================== --- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original) +++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Sun Apr 26 22:41:53 2009 @@ -29,7 +29,6 @@ import java.util.Map; import java.util.Set; -import org.apache.commons.jxpath.JXPathContext; import org.apache.maven.ArtifactFilterManager; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.ArtifactUtils; @@ -1679,6 +1678,7 @@ return mojoExecutions; } + /* public Object getMojoParameterFor( MojoExecution mojoExecution, String xPath ) throws Exception { @@ -1688,6 +1688,7 @@ return JXPathContext.newContext( mergedConfig ).getValue( xPath ); } + */ public void executeMojo( MojoExecution mojoExecution, MavenSession session ) throws Exception Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java?rev=768820&r1=768819&r2=768820&view=diff ============================================================================== --- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java (original) +++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java Sun Apr 26 22:41:53 2009 @@ -17,6 +17,7 @@ import java.util.Collection; +import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.resolver.ArtifactNotFoundException; import org.apache.maven.artifact.resolver.ArtifactResolutionException; import org.apache.maven.execution.MavenSession; @@ -56,9 +57,11 @@ Collection<MojoExecution> getMojoExecutionsForGoal( String goal ) throws Exception; + /* Object getMojoParameterFor( MojoExecution mojoExecution, String xPath ) throws Exception; - + */ + void executeMojo( MojoExecution mojoExecution, MavenSession session ) throws Exception; Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=768820&r1=768819&r2=768820&view=diff ============================================================================== --- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java (original) +++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java Sun Apr 26 22:41:53 2009 @@ -170,11 +170,13 @@ return pluginManager.getMojoExecutionsForGoal( goal ); } + /* public Object getMojoParameterFor(MojoExecution mojoExecution, String xPath) throws Exception { return pluginManager.getMojoParameterFor( mojoExecution, xPath); } + */ public void executeMojo(MojoExecution mojoExecution, MavenSession mavenSession ) throws Exception