Author: jdcasey
Date: Tue Jul 22 16:05:40 2008
New Revision: 678938
URL: http://svn.apache.org/viewvc?rev=678938&view=rev
Log:
Improve normalization of file separators for checking values.
Modified:
maven/core-integration-testing/trunk/core-integration-tests-support/core-integration-testing-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PluginParamInterpolationMojo.java
maven/core-integration-testing/trunk/core-integration-tests-support/core-integration-testing-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationMojo.java
maven/core-integration-testing/trunk/core-integration-tests-support/core-integration-testing-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationVerifierMojo.java
Modified: maven/core-integration-testing/trunk/core-integration-tests-support/core-integration-testing-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PluginParamInterpolationMojo.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests-support/core-integration-testing-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PluginParamInterpolationMojo.java?rev=678938&r1=678937&r2=678938&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests-support/core-integration-testing-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PluginParamInterpolationMojo.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests-support/core-integration-testing-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PluginParamInterpolationMojo.java Tue Jul 22 16:05:40 2008
@@ -16,7 +16,8 @@
* limitations under the License.
*/
-import org.apache.maven.artifact.Artifact;
+import java.io.File;
+
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
@@ -38,10 +39,17 @@
public void execute()
throws MojoExecutionException
{
-
- if ( !myDirectory.equals( project.getBuild().getDirectory() + "/foo" ) )
+ myDirectory = normalize( myDirectory );
+ String value = normalize( new File( project.getBuild().getDirectory(), "foo" ).getAbsolutePath() );
+
+ if ( !myDirectory.equals( value ) )
{
throw new MojoExecutionException( "Directory supplied: " + myDirectory + " is not the same as the project build directory: " + project.getBuild().getDirectory() + " + '/foo'" );
}
}
+
+ private String normalize( String src )
+ {
+ return src.replace( '/', File.separatorChar ).replace( '\\', File.separatorChar );
+ }
}
Modified: maven/core-integration-testing/trunk/core-integration-tests-support/core-integration-testing-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationMojo.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests-support/core-integration-testing-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationMojo.java?rev=678938&r1=678937&r2=678938&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests-support/core-integration-testing-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationMojo.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests-support/core-integration-testing-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationMojo.java Tue Jul 22 16:05:40 2008
@@ -18,7 +18,6 @@
import java.io.File;
-import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
@@ -32,25 +31,23 @@
extends AbstractMojo
{
- private static final char FS = File.separatorChar;
-
- /** @parameter */
- private String myDirectory;
-
/** @parameter expression="${project}" */
private MavenProject project;
public void execute()
throws MojoExecutionException
{
- String value = project.getProperties().getProperty( "myDirectory" ).replace( '/', FS ).replace( '\\', FS );
-
- String targetValue = project.getBuild().getDirectory() + FS + "foo";
- targetValue = targetValue.replace( '/', FS).replace( '\\', FS );
+ String value = normalize( project.getProperties().getProperty( "myDirectory" ) );
+ String targetValue = normalize( new File( project.getBuild().getDirectory(), "foo" ).getAbsolutePath() );
if ( !value.equals( targetValue ) )
{
throw new MojoExecutionException( "Property value of 'myDirectory': " + value + " should equal the 'foo' subpath of the project build directory: " + targetValue );
}
}
+
+ private String normalize( String src )
+ {
+ return src.replace( '/', File.separatorChar ).replace( '\\', File.separatorChar );
+ }
}
Modified: maven/core-integration-testing/trunk/core-integration-tests-support/core-integration-testing-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationVerifierMojo.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests-support/core-integration-testing-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationVerifierMojo.java?rev=678938&r1=678937&r2=678938&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests-support/core-integration-testing-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationVerifierMojo.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests-support/core-integration-testing-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationVerifierMojo.java Tue Jul 22 16:05:40 2008
@@ -1,16 +1,13 @@
package org.apache.maven.plugin.coreit;
+import java.util.Enumeration;
+import java.util.Properties;
+
+import org.apache.maven.model.Model;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.model.Model;
-
-import java.io.File;
-import java.util.Properties;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Enumeration;
/**
* @goal verify-property
@@ -24,11 +21,6 @@
private MavenProject project;
/**
- * @parameter expression="${buildSourceDirectory}"
- */
- private File buildSourceDirectory;
-
- /**
* @parameter expression="${properties}"
*/
private Properties properties;