mirror of https://github.com/apache/maven.git
[MNG-5577] Don't use LegacyRepositoryLayout in tests.
This class was deleted, but retained in tests. We don't need it anymore, so drop it.
This commit is contained in:
Joseph Walton
rfscholte
parent
0f519b4af4
commit
c0b291ef29
|
|
@ -121,7 +121,7 @@ public abstract class AbstractMavenProjectTestCase
|
||||||
protected ArtifactRepository getLocalRepository()
|
protected ArtifactRepository getLocalRepository()
|
||||||
throws Exception
|
throws Exception
|
||||||
{
|
{
|
||||||
ArtifactRepositoryLayout repoLayout = lookup( ArtifactRepositoryLayout.class, "legacy" );
|
ArtifactRepositoryLayout repoLayout = lookup( ArtifactRepositoryLayout.class );
|
||||||
|
|
||||||
ArtifactRepository r = repositorySystem.createArtifactRepository( "local", "file://" + getLocalRepositoryPath().getAbsolutePath(), repoLayout, null, null );
|
ArtifactRepository r = repositorySystem.createArtifactRepository( "local", "file://" + getLocalRepositoryPath().getAbsolutePath(), repoLayout, null, null );
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,89 +0,0 @@
|
||||||
package org.apache.maven.repository;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Licensed to the Apache Software Foundation (ASF) under one
|
|
||||||
* or more contributor license agreements. See the NOTICE file
|
|
||||||
* distributed with this work for additional information
|
|
||||||
* regarding copyright ownership. The ASF licenses this file
|
|
||||||
* to you under the Apache License, Version 2.0 (the
|
|
||||||
* "License"); you may not use this file except in compliance
|
|
||||||
* with the License. You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing,
|
|
||||||
* software distributed under the License is distributed on an
|
|
||||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
||||||
* KIND, either express or implied. See the License for the
|
|
||||||
* specific language governing permissions and limitations
|
|
||||||
* under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
import org.apache.maven.artifact.Artifact;
|
|
||||||
import org.apache.maven.artifact.handler.ArtifactHandler;
|
|
||||||
import org.apache.maven.artifact.metadata.ArtifactMetadata;
|
|
||||||
import org.apache.maven.artifact.repository.ArtifactRepository;
|
|
||||||
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
|
|
||||||
import org.codehaus.plexus.component.annotations.Component;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author jdcasey
|
|
||||||
*/
|
|
||||||
@Component(role=ArtifactRepositoryLayout.class, hint="legacy")
|
|
||||||
public class LegacyRepositoryLayout
|
|
||||||
implements ArtifactRepositoryLayout
|
|
||||||
{
|
|
||||||
private static final String PATH_SEPARATOR = "/";
|
|
||||||
|
|
||||||
public String getId()
|
|
||||||
{
|
|
||||||
return "legacy";
|
|
||||||
}
|
|
||||||
|
|
||||||
public String pathOf( Artifact artifact )
|
|
||||||
{
|
|
||||||
ArtifactHandler artifactHandler = artifact.getArtifactHandler();
|
|
||||||
|
|
||||||
StringBuilder path = new StringBuilder( 128 );
|
|
||||||
|
|
||||||
path.append( artifact.getGroupId() ).append( '/' );
|
|
||||||
path.append( artifactHandler.getDirectory() ).append( '/' );
|
|
||||||
path.append( artifact.getArtifactId() ).append( '-' ).append( artifact.getVersion() );
|
|
||||||
|
|
||||||
if ( artifact.hasClassifier() )
|
|
||||||
{
|
|
||||||
path.append( '-' ).append( artifact.getClassifier() );
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( artifactHandler.getExtension() != null && artifactHandler.getExtension().length() > 0 )
|
|
||||||
{
|
|
||||||
path.append( '.' ).append( artifactHandler.getExtension() );
|
|
||||||
}
|
|
||||||
|
|
||||||
return path.toString();
|
|
||||||
}
|
|
||||||
|
|
||||||
public String pathOfLocalRepositoryMetadata( ArtifactMetadata metadata,
|
|
||||||
ArtifactRepository repository )
|
|
||||||
{
|
|
||||||
return pathOfRepositoryMetadata( metadata, metadata.getLocalFilename( repository ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
private String pathOfRepositoryMetadata( ArtifactMetadata metadata,
|
|
||||||
String filename )
|
|
||||||
{
|
|
||||||
StringBuilder path = new StringBuilder( 128 );
|
|
||||||
|
|
||||||
path.append( metadata.getGroupId() ).append( PATH_SEPARATOR ).append( "poms" ).append( PATH_SEPARATOR );
|
|
||||||
|
|
||||||
path.append( filename );
|
|
||||||
|
|
||||||
return path.toString();
|
|
||||||
}
|
|
||||||
|
|
||||||
public String pathOfRemoteRepositoryMetadata( ArtifactMetadata metadata )
|
|
||||||
{
|
|
||||||
return pathOfRepositoryMetadata( metadata, metadata.getRemoteFilename() );
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -1,92 +0,0 @@
|
||||||
package org.apache.maven.repository;
|
|
||||||
|
|
||||||
import javax.inject.Named;
|
|
||||||
import javax.inject.Singleton;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Licensed to the Apache Software Foundation (ASF) under one
|
|
||||||
* or more contributor license agreements. See the NOTICE file
|
|
||||||
* distributed with this work for additional information
|
|
||||||
* regarding copyright ownership. The ASF licenses this file
|
|
||||||
* to you under the Apache License, Version 2.0 (the
|
|
||||||
* "License"); you may not use this file except in compliance
|
|
||||||
* with the License. You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing,
|
|
||||||
* software distributed under the License is distributed on an
|
|
||||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
||||||
* KIND, either express or implied. See the License for the
|
|
||||||
* specific language governing permissions and limitations
|
|
||||||
* under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
import org.apache.maven.artifact.Artifact;
|
|
||||||
import org.apache.maven.artifact.handler.ArtifactHandler;
|
|
||||||
import org.apache.maven.artifact.metadata.ArtifactMetadata;
|
|
||||||
import org.apache.maven.artifact.repository.ArtifactRepository;
|
|
||||||
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author jdcasey
|
|
||||||
*/
|
|
||||||
@Named( "legacy" )
|
|
||||||
@Singleton
|
|
||||||
public class LegacyRepositoryLayout
|
|
||||||
implements ArtifactRepositoryLayout
|
|
||||||
{
|
|
||||||
private static final String PATH_SEPARATOR = "/";
|
|
||||||
|
|
||||||
public String getId()
|
|
||||||
{
|
|
||||||
return "legacy";
|
|
||||||
}
|
|
||||||
|
|
||||||
public String pathOf( Artifact artifact )
|
|
||||||
{
|
|
||||||
ArtifactHandler artifactHandler = artifact.getArtifactHandler();
|
|
||||||
|
|
||||||
StringBuilder path = new StringBuilder( 128 );
|
|
||||||
|
|
||||||
path.append( artifact.getGroupId() ).append( '/' );
|
|
||||||
path.append( artifactHandler.getDirectory() ).append( '/' );
|
|
||||||
path.append( artifact.getArtifactId() ).append( '-' ).append( artifact.getVersion() );
|
|
||||||
|
|
||||||
if ( artifact.hasClassifier() )
|
|
||||||
{
|
|
||||||
path.append( '-' ).append( artifact.getClassifier() );
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( artifactHandler.getExtension() != null && artifactHandler.getExtension().length() > 0 )
|
|
||||||
{
|
|
||||||
path.append( '.' ).append( artifactHandler.getExtension() );
|
|
||||||
}
|
|
||||||
|
|
||||||
return path.toString();
|
|
||||||
}
|
|
||||||
|
|
||||||
public String pathOfLocalRepositoryMetadata( ArtifactMetadata metadata,
|
|
||||||
ArtifactRepository repository )
|
|
||||||
{
|
|
||||||
return pathOfRepositoryMetadata( metadata, metadata.getLocalFilename( repository ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
private String pathOfRepositoryMetadata( ArtifactMetadata metadata,
|
|
||||||
String filename )
|
|
||||||
{
|
|
||||||
StringBuilder path = new StringBuilder( 128 );
|
|
||||||
|
|
||||||
path.append( metadata.getGroupId() ).append( PATH_SEPARATOR ).append( "poms" ).append( PATH_SEPARATOR );
|
|
||||||
|
|
||||||
path.append( filename );
|
|
||||||
|
|
||||||
return path.toString();
|
|
||||||
}
|
|
||||||
|
|
||||||
public String pathOfRemoteRepositoryMetadata( ArtifactMetadata metadata )
|
|
||||||
{
|
|
||||||
return pathOfRepositoryMetadata( metadata, metadata.getRemoteFilename() );
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue