You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2011/05/25 18:58:08 UTC
svn commit: r1127584 - in
/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer: ./
src/main/java/org/apache/maven/archiva/repository/content/
src/test/java/org/apache/maven/archiva/repository/
src/test/java/org/apache/maven/archiva/repo...
Author: olamy
Date: Wed May 25 16:58:08 2011
New Revision: 1127584
URL: http://svn.apache.org/viewvc?rev=1127584&view=rev
Log:
correctly use basedir for configuration and tests : pass it tru sysprops via surefire
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/RepositoryRequest.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/AbstractRepositoryLayerTestCase.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/RepositoryRequestTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/spring-context-repo-request-test.xml
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/pom.xml?rev=1127584&r1=1127583&r2=1127584&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/pom.xml Wed May 25 16:58:08 2011
@@ -72,4 +72,17 @@
<artifactId>maven2-repository</artifactId>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <basedir>${basedir}</basedir>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/RepositoryRequest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/RepositoryRequest.java?rev=1127584&r1=1127583&r2=1127584&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/RepositoryRequest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/RepositoryRequest.java Wed May 25 16:58:08 2011
@@ -34,7 +34,6 @@ import javax.inject.Named;
* ArtifactReference.
*
* @version $Id$
- * @todo no need to be a component once legacy path parser is not
* <p/>
*/
public class RepositoryRequest
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/AbstractRepositoryLayerTestCase.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/AbstractRepositoryLayerTestCase.java?rev=1127584&r1=1127583&r2=1127584&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/AbstractRepositoryLayerTestCase.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/AbstractRepositoryLayerTestCase.java Wed May 25 16:58:08 2011
@@ -41,6 +41,17 @@ public abstract class AbstractRepository
extends TestCase
{
+ public static String getBasedir()
+ {
+ String basedir = System.getProperty( "basedir" );
+ if ( basedir == null )
+ {
+ basedir = new File( "" ).getAbsolutePath();
+ }
+
+ return basedir;
+ }
+
@Inject
protected ApplicationContext applicationContext;
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/RepositoryRequestTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/RepositoryRequestTest.java?rev=1127584&r1=1127583&r2=1127584&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/RepositoryRequestTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/RepositoryRequestTest.java Wed May 25 16:58:08 2011
@@ -38,12 +38,14 @@ import java.io.File;
*
* @version $Id$
*/
-@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context-repo-request-test.xml" } )
+@ContextConfiguration(
+ locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context-repo-request-test.xml" } )
public class RepositoryRequestTest
extends AbstractRepositoryLayerTestCase
{
- @Inject @Named(value = "archivaConfiguration#repo-request-test")
+ @Inject
+ @Named( value = "archivaConfiguration#repo-request-test" )
private ArchivaConfiguration archivaConfiguration;
private RepositoryRequest repoRequest;
@@ -367,7 +369,7 @@ public class RepositoryRequestTest
private ManagedRepositoryContent createManagedRepo( String layout )
throws Exception
{
- File repoRoot = new File( "target/test-repo" );
+ File repoRoot = new File( getBasedir() + "/target/test-repo" );
return createManagedRepositoryContent( "test-internal", "Internal Test Repo", repoRoot, layout );
}
@@ -444,8 +446,8 @@ public class RepositoryRequestTest
ManagedRepositoryContent repository = createManagedRepo( "default" );
// Test (pom) legacy to default
- assertEquals( "mygroup/myejb/1.0/myejb-1.0.jar",
- repoRequest.toNativePath( "mygroup/ejbs/myejb-1.0.jar", repository ) );
+ String result = repoRequest.toNativePath( "mygroup/ejbs/myejb-1.0.jar", repository );
+ assertEquals( "mygroup/myejb/1.0/myejb-1.0.jar", result );
}
@Test
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/spring-context-repo-request-test.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/spring-context-repo-request-test.xml?rev=1127584&r1=1127583&r2=1127584&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/spring-context-repo-request-test.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/spring-context-repo-request-test.xml Wed May 25 16:58:08 2011
@@ -24,14 +24,15 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd"
- default-lazy-init="false">
+ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+ <context:property-placeholder system-properties-mode="OVERRIDE"/>
<bean name="archivaConfiguration#repo-request-test" class="org.apache.maven.archiva.configuration.DefaultArchivaConfiguration">
<property name="registry" ref="registry#configured"/>
</bean>
<alias name="archivaConfiguration#repo-request-test" alias="archivaConfiguration#default"/>
+ <alias name="archivaConfiguration#repo-request-test" alias="archivaConfiguration"/>
<bean name="registry#configured" class="org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry">
<property name="properties">