You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jo...@apache.org on 2008/03/11 04:59:06 UTC
svn commit: r635795 - in
/maven/archiva/trunk/archiva-base/archiva-repository-layer/src:
main/java/org/apache/maven/archiva/repository/project/filters/
test/java/org/apache/maven/archiva/repository/project/filters/
test/repositories/default-repository/...
Author: joakime
Date: Mon Mar 10 20:59:04 2008
New Revision: 635795
URL: http://svn.apache.org/viewvc?rev=635795&view=rev
Log:
MRM-731 - variable in url pom are not replaced.
Applying same fix as in branch/archiva-1.0.x
Modified:
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/ProjectModelExpressionFilter.java
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/filters/ProjectModelExpressionExpanderTest.java
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/test/2.0.4-SNAPSHOT/test-2.0.4-SNAPSHOT.pom
Modified: maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/ProjectModelExpressionFilter.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/ProjectModelExpressionFilter.java?rev=635795&r1=635794&r2=635795&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/ProjectModelExpressionFilter.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/ProjectModelExpressionFilter.java Mon Mar 10 20:59:04 2008
@@ -104,11 +104,23 @@
try
{
// Setup some common properties.
- props.setProperty( "pom.groupId", StringUtils.defaultString( evaluator.expand( model.getGroupId() ) ) );
- props.setProperty( "pom.artifactId", StringUtils.defaultString( evaluator
- .expand( model.getArtifactId() ) ) );
- props.setProperty( "pom.version", StringUtils.defaultString( evaluator.expand( model.getVersion() ) ) );
- props.setProperty( "pom.name", StringUtils.defaultString( evaluator.expand( model.getName() ) ) );
+ String groupId = StringUtils.defaultString( evaluator.expand( model.getGroupId() ) );
+ String artifactId = StringUtils.defaultString( evaluator.expand( model.getArtifactId() ) );
+ String version = StringUtils.defaultString( evaluator.expand( model.getVersion() ) );
+ String name = StringUtils.defaultString( evaluator.expand( model.getName() ) );
+
+ /* Archiva doesn't need to handle a full expression language with object tree walking
+ * as the requirements within Archiva are much smaller, a quick replacement of the
+ * important fields (groupId, artifactId, version, name) are handled specifically.
+ */
+ props.setProperty( "pom.groupId", groupId );
+ props.setProperty( "pom.artifactId", artifactId );
+ props.setProperty( "pom.version", version );
+ props.setProperty( "pom.name", name );
+ props.setProperty( "project.groupId", groupId );
+ props.setProperty( "project.artifactId", artifactId );
+ props.setProperty( "project.version", version );
+ props.setProperty( "project.name", name );
// Evaluate everything.
ret.setVersion( evaluator.expand( ret.getVersion() ) );
Modified: maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/filters/ProjectModelExpressionExpanderTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/filters/ProjectModelExpressionExpanderTest.java?rev=635795&r1=635794&r2=635795&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/filters/ProjectModelExpressionExpanderTest.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/filters/ProjectModelExpressionExpanderTest.java Mon Mar 10 20:59:04 2008
@@ -91,7 +91,7 @@
assertEquals( "Dependency [" + dep.getArtifactId() + "] Version", "1.0-SNAPSHOT", dep.getVersion() );
}
}
-
+
/**
* [MRM-487] pom version is not resolved
* [MRM-488] properties in pom are not resolved (at least while browsing)
@@ -112,10 +112,16 @@
String evaluatedModelText = toModelText( filteredModel );
// Test xml buffer for the existance of an unevaluated expression.
+ boolean foundUnevaluated = false;
if ( evaluatedModelText.indexOf( "${" ) != ( -1 ) )
{
System.err.println( "Found Expression:\n" + evaluatedModelText );
- fail( "Found Unevaluated Expression. (see System.err)" );
+ foundUnevaluated = true;
+ }
+
+ if ( foundUnevaluated )
+ {
+ fail( "Found Unevaluated Expression. (see System.err for details)" );
}
}
Modified: maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/test/2.0.4-SNAPSHOT/test-2.0.4-SNAPSHOT.pom
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/test/2.0.4-SNAPSHOT/test-2.0.4-SNAPSHOT.pom?rev=635795&r1=635794&r2=635795&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/test/2.0.4-SNAPSHOT/test-2.0.4-SNAPSHOT.pom (original)
+++ maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/test/2.0.4-SNAPSHOT/test-2.0.4-SNAPSHOT.pom Mon Mar 10 20:59:04 2008
@@ -102,7 +102,8 @@
<prj.confluence.path>TEST/Archiva</prj.confluence.path>
</properties>
- <url>${kb.site.url}/${prj.url.relative}</url>
+ <!-- MRM-731 : variable in url pom are not replaced. -->
+ <url>http://j.random.server.com/docs/${project.groupId}/${project.artifactId}/${project.version}</url>
<scm>
<connection>scm:svn:${prj.svn}/${prj.svn.branch}</connection>