You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2006/06/15 08:15:22 UTC
svn commit: r414485 - in
/maven/repository-manager/trunk/maven-repository-converter/src/main/java/org/apache/maven/repository/converter:
DefaultRepositoryConverter.java RepositoryConverter.java
Author: jvanzyl
Date: Wed Jun 14 23:15:22 2006
New Revision: 414485
URL: http://svn.apache.org/viewvc?rev=414485&view=rev
Log:
o fixing requirement
Modified:
maven/repository-manager/trunk/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/DefaultRepositoryConverter.java
maven/repository-manager/trunk/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/RepositoryConverter.java
Modified: maven/repository-manager/trunk/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/DefaultRepositoryConverter.java
URL: http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/DefaultRepositoryConverter.java?rev=414485&r1=414484&r2=414485&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/DefaultRepositoryConverter.java (original)
+++ maven/repository-manager/trunk/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/DefaultRepositoryConverter.java Wed Jun 14 23:15:22 2006
@@ -19,6 +19,8 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
+import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
import org.apache.maven.artifact.repository.metadata.Metadata;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
@@ -105,7 +107,9 @@
*/
private I18N i18n;
- public void convert( Artifact artifact, ArtifactRepository targetRepository, ArtifactReporter reporter )
+ public void convert( Artifact artifact,
+ ArtifactRepository targetRepository,
+ ArtifactReporter reporter )
throws RepositoryConversionException
{
if ( artifact.getRepository().getUrl().equals( targetRepository.getUrl() ) )
@@ -163,8 +167,11 @@
return metadata;
}
- private void updateMetadata( RepositoryMetadata artifactMetadata, ArtifactRepository sourceRepository,
- ArtifactRepository targetRepository, Metadata newMetadata, FileTransaction transaction )
+ private void updateMetadata( RepositoryMetadata artifactMetadata,
+ ArtifactRepository sourceRepository,
+ ArtifactRepository targetRepository,
+ Metadata newMetadata,
+ FileTransaction transaction )
throws RepositoryConversionException
{
Metadata metadata;
@@ -188,7 +195,7 @@
if ( mergeWithSourceMetadata )
{
File srcfile = new File( sourceRepository.getBasedir(),
- sourceRepository.pathOfRemoteRepositoryMetadata( artifactMetadata ) );
+ sourceRepository.pathOfRemoteRepositoryMetadata( artifactMetadata ) );
if ( srcfile.exists() )
{
@@ -251,7 +258,8 @@
return metadata;
}
- private boolean validateMetadata( Artifact artifact, ArtifactReporter reporter )
+ private boolean validateMetadata( Artifact artifact,
+ ArtifactReporter reporter )
throws RepositoryConversionException
{
ArtifactRepository repository = artifact.getRepository();
@@ -278,7 +286,9 @@
return result;
}
- private boolean validateMetadata( Metadata metadata, RepositoryMetadata repositoryMetadata, Artifact artifact,
+ private boolean validateMetadata( Metadata metadata,
+ RepositoryMetadata repositoryMetadata,
+ Artifact artifact,
ArtifactReporter reporter )
{
String groupIdKey;
@@ -380,7 +390,9 @@
return result;
}
- private boolean copyPom( Artifact artifact, ArtifactRepository targetRepository, ArtifactReporter reporter,
+ private boolean copyPom( Artifact artifact,
+ ArtifactRepository targetRepository,
+ ArtifactReporter reporter,
FileTransaction transaction )
throws RepositoryConversionException
{
@@ -495,8 +507,10 @@
return result;
}
- private boolean doRelocation( Artifact artifact, org.apache.maven.model.v3_0_0.Model v3Model,
- ArtifactRepository repository, FileTransaction transaction )
+ private boolean doRelocation( Artifact artifact,
+ org.apache.maven.model.v3_0_0.Model v3Model,
+ ArtifactRepository repository,
+ FileTransaction transaction )
throws IOException
{
Properties properties = v3Model.getProperties();
@@ -539,9 +553,15 @@
}
}
- private void writeRelocationPom( String groupId, String artifactId, String version, String newGroupId,
- String newArtifactId, String newVersion, String message,
- ArtifactRepository repository, FileTransaction transaction )
+ private void writeRelocationPom( String groupId,
+ String artifactId,
+ String version,
+ String newGroupId,
+ String newArtifactId,
+ String newVersion,
+ String message,
+ ArtifactRepository repository,
+ FileTransaction transaction )
throws IOException
{
Model pom = new Model();
@@ -574,7 +594,8 @@
transaction.createFile( strWriter.toString(), pomFile );
}
- private String getI18NString( String key, String arg0 )
+ private String getI18NString( String key,
+ String arg0 )
{
return i18n.format( getClass().getName(), Locale.getDefault(), key, arg0 );
}
@@ -584,7 +605,9 @@
return i18n.getString( getClass().getName(), Locale.getDefault(), key );
}
- private boolean testChecksums( Artifact artifact, File file, ArtifactReporter reporter )
+ private boolean testChecksums( Artifact artifact,
+ File file,
+ ArtifactReporter reporter )
throws IOException, RepositoryConversionException
{
boolean result;
@@ -603,8 +626,12 @@
return result;
}
- private boolean verifyChecksum( File file, String fileName, String algorithm, ArtifactReporter reporter,
- Artifact artifact, String key )
+ private boolean verifyChecksum( File file,
+ String fileName,
+ String algorithm,
+ ArtifactReporter reporter,
+ Artifact artifact,
+ String key )
throws IOException, NoSuchAlgorithmException
{
boolean result = true;
@@ -622,7 +649,9 @@
return result;
}
- private boolean copyArtifact( Artifact artifact, ArtifactRepository targetRepository, ArtifactReporter reporter,
+ private boolean copyArtifact( Artifact artifact,
+ ArtifactRepository targetRepository,
+ ArtifactReporter reporter,
FileTransaction transaction )
throws RepositoryConversionException
{
@@ -665,7 +694,9 @@
return result;
}
- public void convert( List artifacts, ArtifactRepository targetRepository, ArtifactReporter reporter )
+ public void convert( List artifacts,
+ ArtifactRepository targetRepository,
+ ArtifactReporter reporter )
throws RepositoryConversionException
{
for ( Iterator i = artifacts.iterator(); i.hasNext(); )
Modified: maven/repository-manager/trunk/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/RepositoryConverter.java
URL: http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/RepositoryConverter.java?rev=414485&r1=414484&r2=414485&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/RepositoryConverter.java (original)
+++ maven/repository-manager/trunk/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/RepositoryConverter.java Wed Jun 14 23:15:22 2006
@@ -21,6 +21,7 @@
import org.apache.maven.repository.reporting.ArtifactReporter;
import java.util.List;
+import java.io.File;
/**
* Copy a set of artifacts from one repository to the other, converting if necessary.