when used as a maven1 proxy, Archiva should handle relocation from maven2 poms

Patch updated for "archiva" renamed project.

Patch updated to allow request for checksum on a relocated artifact to return the checksum of the relocated artifact.

Testcase that uses servletapi POM to relocate a maven1 request.

Hi Nicolas. The test looks pretty, good, but some comments:

• this will require downloading from ibiblio, which is not very good. I think it would be better to have the 'managed' repository created in, say, target/test/managed-repository instead of src/test/maven-2.x-repository, and use maven-2.x repository as the proxy repo (using file:// ... as the URL)

• in the patch, you should omit binary files. Besides, its not necessary to have a full size servlet jar for this test

• the code and test should be in the proxy module instead of core. The code should be part of the proxy request handler instead of being done in the proxy manager. This can guarantee it gets done after the POM is downloaded, whereas this technique I think will fail if the POM was not already present.

Can you review the patch? Thanks!

If you could submit a single diff file for the proxy module that would be most helpful.

Repackaged patch to include testcase.

adds "testLegacyRequestConvertedToMaven2PathInManagedRepo" to ProxyRequestHandlerTest.

Please don't mind my patch name is "MRM-155" as it is a typo. This patch file IS related to MRM-153

I realy have troubles with numbers. Please don't care this patch that IS for MRM-155 and has been also attached to MRM-155 issue. I'll provide a patch for MRM-153 (this one) latter.

Sory for noise...

This patch moves the relocation handling in DefaultProxyRequestHandler (archiva-proxy). No more change on archiva-core is required.
Testcase is included for artecfact + checksum relocation on maven1 request.

This patch requires some logic change on the DefaultProxyRequestHandler.get() :
Artifact layout is discovered BEFORE proxies are used to get the file. This require to handle checksums, metadata and unknown file before requesting proxied repositories.

I moved metadata and unknown files handling in a dedicated method to clarify code.

Please note this patch includes correction for issue MRM-155 as managed repository path is build during artifact discovery, so my patch for MRM-155 gets obsolete if this patch is applied.

there are a number of issues with this that I am reworking:

• the same ones highlighted in MRM-155
• incorrect assumptions about the location of the POM
• didn't test m2 relocations at all
• exception handling in the relocation was not ideal
• applyRelocation didn't need to return artifact, it modifies the passed in instance

This feature is broken by the use of DAV repository in place of the original "/proxy" path.

in ProxiedDavServer :
if ( WebdavMethodUtil.isReadMethod( request.getRequest().getMethod() ) )
{
if ( !hasResource( request.getLogicalResource() ) )

}
davServer.process( request, response );

> The relocation is handled in fetchContentFromProxies( request ); but the relocated path is not reported in the request

The request can be updated, but this requires to convert the File object into a path in the managed repository. I solved this by using :

File file = proxyRequestHandler.get( request.getLogicalResource(), this.proxiedRepositories, this.managedRepository,
this.wagonProxy );
File baseDir = new File( this.managedRepository.getBasedir() );
String path = file.getAbsolutePath().substring( baseDir.getAbsolutePath().length() );
request.getRequest().setPathInfo( path );

... but those absolutePath.substring don't look very clean. Is there any other way to compute this Path from the File object and the managedRepository ? An alternative would be to return a "RepositoryEntry" in place of a File, that would contain both File and path.

This patch changes ProxyRequestHandler to return a ProxiedArtifact with both File and (relocated) Path.

This latest patch includes previous but also fixes MRM-268 :

as Maven2 request come from maven2 we can expect the client to handle relocation, and the client expecet archiva to return the expected artifact (a POM) with no internal relocation.

Previous patch also was missing the ProxiedArtifact class.

MRM153-reopened+MRM-268.patch applied in 0.9 branch

need to test this still works in 1.0-*, as it was applied for 0.9

This patch has been tested on 1.0-beta-2-SNAPSHOT (rev 575722)

It allows to get a relocated artifact using either :

maven2 request :
http://localhost:8080/archiva/repository/internal/servletapi/servletapi/2.3/servletapi-2.3.pom
<"client-side" relocation>
http://localhost:8080/archiva/repository/internal/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar

maven1 request :
http://localhost:8080/archiva/repository/internal/javax.servlet/jars/servlet-api-2.3.jar
or <"server-side" relocation>
http://localhost:8080/archiva/repository/internal/servletapi/jars/servletapi-2.3.jar

I'd like to write some junit test but I'm not familiar with plexus and how to test servlet-based code. Maybe some integration-test would be helpfull ?

Patch applied (-r576032)

Thanks!