Modified: maven/components/branches/john-2.0.x-plxInterpolation/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java URL: http://svn.apache.org/viewvc/maven/components/branches/john-2.0.x-plxInterpolation/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java?rev=671320&r1=671319&r2=671320&view=diff ============================================================================== --- maven/components/branches/john-2.0.x-plxInterpolation/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java (original) +++ maven/components/branches/john-2.0.x-plxInterpolation/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java Tue Jun 24 12:51:37 2008 @@ -50,10 +50,16 @@ Model interpolate( Model model, Map context, boolean strict ) throws ModelInterpolationException; - Model interpolate( Model model, File projectDir, ProjectBuilderConfiguration config, boolean debugEnabled ) throws ModelInterpolationException; + + String interpolate( String src, + Model model, + File projectDir, + ProjectBuilderConfiguration config, + boolean debugEnabled ) + throws ModelInterpolationException; } \ No newline at end of file
Modified: maven/components/branches/john-2.0.x-plxInterpolation/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java URL: http://svn.apache.org/viewvc/maven/components/branches/john-2.0.x-plxInterpolation/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java?rev=671320&r1=671319&r2=671320&view=diff ============================================================================== --- maven/components/branches/john-2.0.x-plxInterpolation/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java (original) +++ maven/components/branches/john-2.0.x-plxInterpolation/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java Tue Jun 24 12:51:37 2008 @@ -137,7 +137,7 @@ Properties props = new Properties(); props.putAll( context ); - serializedModel = interpolateInternal( serializedModel, + serializedModel = interpolate( serializedModel, model, null, new DefaultProjectBuilderConfiguration().setExecutionProperties( props ), @@ -183,7 +183,7 @@ } String serializedModel = sWriter.toString(); - serializedModel = interpolateInternal( serializedModel, model, projectDir, config, debugEnabled ); + serializedModel = interpolate( serializedModel, model, projectDir, config, debugEnabled ); StringReader sReader = new StringReader( serializedModel ); @@ -220,11 +220,11 @@ * @param overrideContext * @param outputDebugMessages */ - private String interpolateInternal( String src, - Model model, - final File projectDir, - ProjectBuilderConfiguration config, - boolean debug ) + public String interpolate( String src, + Model model, + final File projectDir, + ProjectBuilderConfiguration config, + boolean debug ) throws ModelInterpolationException { Logger logger = getLogger(); Modified: maven/components/branches/john-2.0.x-plxInterpolation/maven-project/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java URL: http://svn.apache.org/viewvc/maven/components/branches/john-2.0.x-plxInterpolation/maven-project/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java?rev=671320&r1=671319&r2=671320&view=diff ============================================================================== --- maven/components/branches/john-2.0.x-plxInterpolation/maven-project/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java (original) +++ maven/components/branches/john-2.0.x-plxInterpolation/maven-project/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java Tue Jun 24 12:51:37 2008 @@ -41,11 +41,8 @@ "${project.basedir}" }; - private String FILE_SEPARATOR = "/"; + private static final String FILE_SEPARATOR = "/"; - /** - * [EMAIL PROTECTED] - */ public void alignToBaseDirectory( Model model, File basedir ) { if ( basedir == null ) @@ -130,16 +127,26 @@ private String stripBasedirToken( String s ) { - for ( int i = 0; i < BASEDIR_EXPRESSIONS.length; i++ ) + if ( s != null ) { - String basedirExpr = BASEDIR_EXPRESSIONS[i]; - - if ( s != null ) + String basedirExpr = null; + for ( int i = 0; i < BASEDIR_EXPRESSIONS.length; i++ ) { - s = s.trim(); - + basedirExpr = BASEDIR_EXPRESSIONS[i]; if ( s.startsWith( basedirExpr ) ) { + break; + } + else + { + basedirExpr = null; + } + } + + if ( basedirExpr != null ) + { + if ( s.length() > basedirExpr.length() ) + { if ( s.length() > basedirExpr.length() ) { // Take out basedir expression and the leading slash Modified: maven/components/branches/john-2.0.x-plxInterpolation/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java URL: http://svn.apache.org/viewvc/maven/components/branches/john-2.0.x-plxInterpolation/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java?rev=671320&r1=671319&r2=671320&view=diff ============================================================================== --- maven/components/branches/john-2.0.x-plxInterpolation/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java (original) +++ maven/components/branches/john-2.0.x-plxInterpolation/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java Tue Jun 24 12:51:37 2008 @@ -180,6 +180,7 @@ File pom = getTestFile( "src/test/resources/projects/build-path-expression-pom.xml" ); MavenProject project = getProject( pom ); + projectBuilder.calculateConcreteState( project, new DefaultProjectBuilderConfiguration() ); Build build = project.getBuild(); assertNotNull( "Project should have a build section containing the test resource.", build ); Modified: maven/components/branches/john-2.0.x-plxInterpolation/maven-project/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java URL: http://svn.apache.org/viewvc/maven/components/branches/john-2.0.x-plxInterpolation/maven-project/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java?rev=671320&r1=671319&r2=671320&view=diff ============================================================================== --- maven/components/branches/john-2.0.x-plxInterpolation/maven-project/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java (original) +++ maven/components/branches/john-2.0.x-plxInterpolation/maven-project/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java Tue Jun 24 12:51:37 2008 @@ -35,6 +35,7 @@ File f = getTestFile( dir + "project-which-needs-directory-alignment.xml" ); MavenProject project = getProject( f ); + projectBuilder.calculateConcreteState( project, new DefaultProjectBuilderConfiguration() ); assertNotNull( "Test project can't be null!", project ); Modified: maven/components/branches/john-2.0.x-plxInterpolation/maven-repository-metadata/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/john-2.0.x-plxInterpolation/maven-repository-metadata/pom.xml?rev=671320&r1=671319&r2=671320&view=diff ============================================================================== --- maven/components/branches/john-2.0.x-plxInterpolation/maven-repository-metadata/pom.xml (original) +++ maven/components/branches/john-2.0.x-plxInterpolation/maven-repository-metadata/pom.xml Tue Jun 24 12:51:37 2008 @@ -41,6 +41,19 @@ </configuration> </plugin> </plugins> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>clirr-maven-plugin</artifactId> + <configuration> + <includes> + <include>org/apache/maven/artifact/repository/metadata/*</include> + </includes> + </configuration> + </plugin> + </plugins> + </pluginManagement> </build> <dependencies> <dependency> Modified: maven/components/branches/john-2.0.x-plxInterpolation/maven-settings/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/john-2.0.x-plxInterpolation/maven-settings/pom.xml?rev=671320&r1=671319&r2=671320&view=diff ============================================================================== --- maven/components/branches/john-2.0.x-plxInterpolation/maven-settings/pom.xml (original) +++ maven/components/branches/john-2.0.x-plxInterpolation/maven-settings/pom.xml Tue Jun 24 12:51:37 2008 @@ -39,6 +39,19 @@ </configuration> </plugin> </plugins> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>clirr-maven-plugin</artifactId> + <configuration> + <includes> + <include>org/apache/maven/settings/*</include> + </includes> + </configuration> + </plugin> + </plugins> + </pluginManagement> </build> <dependencies> <dependency> Modified: maven/components/branches/john-2.0.x-plxInterpolation/maven-toolchain/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/john-2.0.x-plxInterpolation/maven-toolchain/pom.xml?rev=671320&r1=671319&r2=671320&view=diff ============================================================================== --- maven/components/branches/john-2.0.x-plxInterpolation/maven-toolchain/pom.xml (original) +++ maven/components/branches/john-2.0.x-plxInterpolation/maven-toolchain/pom.xml Tue Jun 24 12:51:37 2008 @@ -96,5 +96,18 @@ </executions> </plugin> </plugins> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>clirr-maven-plugin</artifactId> + <configuration> + <includes> + <include>org/apache/maven/toolchain/model/*</include> + </includes> + </configuration> + </plugin> + </plugins> + </pluginManagement> </build> </project> Modified: maven/components/branches/john-2.0.x-plxInterpolation/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/john-2.0.x-plxInterpolation/pom.xml?rev=671320&r1=671319&r2=671320&view=diff ============================================================================== --- maven/components/branches/john-2.0.x-plxInterpolation/pom.xml (original) +++ maven/components/branches/john-2.0.x-plxInterpolation/pom.xml Tue Jun 24 12:51:37 2008 @@ -230,7 +230,7 @@ <properties> <mavenVersion>2.0.10-SNAPSHOT</mavenVersion> - <wagonVersion>1.0-beta-2</wagonVersion> + <wagonVersion>1.0-beta-3</wagonVersion> </properties> <!--start--> @@ -388,7 +388,7 @@ <dependency> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-webdav</artifactId> - <version>${wagonVersion}</version> + <version>1.0-beta-2</version> </dependency> <dependency> <groupId>org.apache.maven.wagon</groupId>
