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 2007/11/06 04:53:47 UTC
svn commit: r592256 [1/4] - in
/maven/artifact/trunk/src/main/java/org/apache/maven/artifact: ./ deployer/
factory/ installer/ manager/ metadata/ repository/ repository/layout/
repository/metadata/ resolver/ resolver/conflict/ resolver/filter/
resolver...
Author: jvanzyl
Date: Mon Nov 5 19:53:41 2007
New Revision: 592256
URL: http://svn.apache.org/viewvc?rev=592256&view=rev
Log:
o reformatting, no functional changes
Modified:
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/Artifact.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/ArtifactStatus.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/InvalidArtifactRTException.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeploymentException.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/installer/ArtifactInstallationException.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/ChecksumFailedException.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/CredentialsChangeRequest.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/CredentialsDataSource.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/CredentialsDataSourceException.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/metadata/AbstractArtifactMetadata.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadata.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataRetrievalException.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataSource.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/metadata/ResolutionGroup.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataDeploymentException.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataInstallationException.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataReadException.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataResolutionException.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataStoreException.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/CyclicDependencyException.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ResolutionListener.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/WarningResolutionListener.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/ConflictResolver.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/ConflictResolverFactory.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/ConflictResolverNotFoundException.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultConflictResolver.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultConflictResolverFactory.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/FarthestConflictResolver.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/NearestConflictResolver.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/NewestConflictResolver.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/OldestConflictResolver.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/filter/TypeArtifactFilter.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultMetadataResolver.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertice.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequest.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolver.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/Restriction.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/Artifact.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/Artifact.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/Artifact.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/Artifact.java Mon Nov 5 19:53:41 2007
@@ -48,7 +48,7 @@
Pattern VERSION_FILE_PATTERN = Pattern.compile( "^(.*)-([0-9]{8}.[0-9]{6})-([0-9]+)$" );
// TODO: into scope handler
-
+
String SCOPE_COMPILE = ArtifactScopeEnum.compile.toString();
String SCOPE_TEST = ArtifactScopeEnum.test.toString();
@@ -91,9 +91,7 @@
String getBaseVersion();
- /**
- * @todo would like to get rid of this - or at least only have one. Base version should be immutable.
- */
+ /** @todo would like to get rid of this - or at least only have one. Base version should be immutable. */
void setBaseVersion( String baseVersion );
// ----------------------------------------------------------------------
@@ -110,7 +108,8 @@
ArtifactRepository getRepository();
- void updateVersion( String version, ArtifactRepository localRepository );
+ void updateVersion( String version,
+ ArtifactRepository localRepository );
String getDownloadUrl();
@@ -146,9 +145,7 @@
void setResolvedVersion( String version );
- /**
- * @todo remove, a quick hack for the lifecycle executor
- */
+ /** @todo remove, a quick hack for the lifecycle executor */
void setArtifactHandler( ArtifactHandler handler );
boolean isRelease();
@@ -160,7 +157,7 @@
void setAvailableVersions( List versions );
boolean isOptional();
-
+
void setOptional( boolean optional );
ArtifactVersion getSelectedVersion()
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java Mon Nov 5 19:53:41 2007
@@ -1,25 +1,20 @@
package org.apache.maven.artifact;
-public enum ArtifactScopeEnum
+public enum ArtifactScopeEnum
{
- compile(1)
- , test(2)
- , runtime(3)
- , provided(4)
- , system(5)
- ;
+ compile( 1 ), test( 2 ), runtime( 3 ), provided( 4 ), system( 5 );
- public static final ArtifactScopeEnum DEFAULT_SCOPE = compile;
- private int id;
+ public static final ArtifactScopeEnum DEFAULT_SCOPE = compile;
+ private int id;
- // Constructor
- ArtifactScopeEnum( int id )
- {
- this.id = id;
- }
+ // Constructor
+ ArtifactScopeEnum( int id )
+ {
+ this.id = id;
+ }
- int getId()
- {
- return id;
- }
+ int getId()
+ {
+ return id;
+ }
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/ArtifactStatus.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/ArtifactStatus.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/ArtifactStatus.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/ArtifactStatus.java Mon Nov 5 19:53:41 2007
@@ -31,34 +31,22 @@
public final class ArtifactStatus
implements Comparable
{
- /**
- * No trust - no information about status.
- */
+ /** No trust - no information about status. */
public static final ArtifactStatus NONE = new ArtifactStatus( "none", 0 );
- /**
- * No trust - information was generated with defaults.
- */
+ /** No trust - information was generated with defaults. */
public static final ArtifactStatus GENERATED = new ArtifactStatus( "generated", 1 );
- /**
- * Low trust - was converted from the Maven 1.x repository.
- */
+ /** Low trust - was converted from the Maven 1.x repository. */
public static final ArtifactStatus CONVERTED = new ArtifactStatus( "converted", 2 );
- /**
- * Moderate trust - it was deployed directly from a partner.
- */
+ /** Moderate trust - it was deployed directly from a partner. */
public static final ArtifactStatus PARTNER = new ArtifactStatus( "partner", 3 );
- /**
- * Moderate trust - it was deployed directly by a user.
- */
+ /** Moderate trust - it was deployed directly by a user. */
public static final ArtifactStatus DEPLOYED = new ArtifactStatus( "deployed", 4 );
- /**
- * Trusted, as it has had its data verified by hand.
- */
+ /** Trusted, as it has had its data verified by hand. */
public static final ArtifactStatus VERIFIED = new ArtifactStatus( "verified", 5 );
private final int rank;
@@ -67,7 +55,8 @@
private static Map map;
- private ArtifactStatus( String key, int rank )
+ private ArtifactStatus( String key,
+ int rank )
{
this.rank = rank;
this.key = key;
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/ArtifactUtils.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/ArtifactUtils.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/ArtifactUtils.java Mon Nov 5 19:53:41 2007
@@ -47,7 +47,8 @@
return versionlessKey( artifact.getGroupId(), artifact.getArtifactId() );
}
- public static String versionlessKey( String groupId, String artifactId )
+ public static String versionlessKey( String groupId,
+ String artifactId )
{
if ( groupId == null )
{
@@ -60,12 +61,18 @@
return groupId + ":" + artifactId;
}
- public static String artifactId( String groupId, String artifactId, String type, String version )
+ public static String artifactId( String groupId,
+ String artifactId,
+ String type,
+ String version )
{
return artifactId( groupId, artifactId, type, null, version );
}
- public static String artifactId( String groupId, String artifactId, String type, String classifier,
+ public static String artifactId( String groupId,
+ String artifactId,
+ String type,
+ String classifier,
String baseVersion )
{
return groupId + ":" + artifactId + ":" + type + ( classifier != null ? ":" + classifier : "" ) + ":" +
@@ -131,8 +138,8 @@
}
DefaultArtifact clone = new DefaultArtifact( artifact.getGroupId(), artifact.getArtifactId(), range.cloneOf(),
- artifact.getScope(), artifact.getType(), artifact.getClassifier(),
- artifact.getArtifactHandler(), artifact.isOptional() );
+ artifact.getScope(), artifact.getType(), artifact.getClassifier(),
+ artifact.getArtifactHandler(), artifact.isOptional() );
clone.setRelease( artifact.isRelease() );
clone.setResolvedVersion( artifact.getVersion() );
clone.setResolved( artifact.isResolved() );
@@ -147,21 +154,21 @@
return clone;
}
-
+
private static List copyList( List original )
{
List copy = null;
-
+
if ( original != null )
{
copy = new ArrayList();
-
+
if ( !original.isEmpty() )
{
copy.addAll( original );
}
}
-
+
return copy;
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/DefaultArtifact.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/DefaultArtifact.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/DefaultArtifact.java Mon Nov 5 19:53:41 2007
@@ -87,14 +87,25 @@
private boolean optional;
- public DefaultArtifact( String groupId, String artifactId, VersionRange versionRange, String scope, String type,
- String classifier, ArtifactHandler artifactHandler )
+ public DefaultArtifact( String groupId,
+ String artifactId,
+ VersionRange versionRange,
+ String scope,
+ String type,
+ String classifier,
+ ArtifactHandler artifactHandler )
{
this( groupId, artifactId, versionRange, scope, type, classifier, artifactHandler, false );
}
- public DefaultArtifact( String groupId, String artifactId, VersionRange versionRange, String scope, String type,
- String classifier, ArtifactHandler artifactHandler, boolean optional )
+ public DefaultArtifact( String groupId,
+ String artifactId,
+ VersionRange versionRange,
+ String scope,
+ String type,
+ String classifier,
+ ArtifactHandler artifactHandler,
+ boolean optional )
{
this.groupId = groupId;
@@ -127,25 +138,25 @@
if ( empty( groupId ) )
{
throw new InvalidArtifactRTException( groupId, artifactId, getVersion(), type,
- "The groupId cannot be empty." );
+ "The groupId cannot be empty." );
}
if ( artifactId == null )
{
throw new InvalidArtifactRTException( groupId, artifactId, getVersion(), type,
- "The artifactId cannot be empty." );
+ "The artifactId cannot be empty." );
}
if ( type == null )
{
throw new InvalidArtifactRTException( groupId, artifactId, getVersion(), type,
- "The type cannot be empty." );
+ "The type cannot be empty." );
}
if ( ( version == null ) && ( versionRange == null ) )
{
throw new InvalidArtifactRTException( groupId, artifactId, getVersion(), type,
- "The version cannot be empty." );
+ "The version cannot be empty." );
}
}
@@ -436,7 +447,8 @@
return result;
}
- public void updateVersion( String version, ArtifactRepository localRepository )
+ public void updateVersion( String version,
+ ArtifactRepository localRepository )
{
setResolvedVersion( version );
setFile( new File( localRepository.getBasedir(), localRepository.pathOf( this ) ) );
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/InvalidArtifactRTException.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/InvalidArtifactRTException.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/InvalidArtifactRTException.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/InvalidArtifactRTException.java Mon Nov 5 19:53:41 2007
@@ -21,19 +21,23 @@
/**
* Exception thrown when the identity of an artifact can not be established,
- * eg. one of groupId, artifactId, version or type is null.
+ * eg. one of groupId, artifactId, version or type is null.
*/
public class InvalidArtifactRTException
extends RuntimeException
{
-
+
private final String groupId;
private final String artifactId;
private final String version;
private final String type;
private final String baseMessage;
- public InvalidArtifactRTException( String groupId, String artifactId, String version, String type, String message )
+ public InvalidArtifactRTException( String groupId,
+ String artifactId,
+ String version,
+ String type,
+ String message )
{
this.groupId = groupId;
this.artifactId = artifactId;
@@ -42,10 +46,15 @@
this.baseMessage = message;
}
- public InvalidArtifactRTException( String groupId, String artifactId, String version, String type, String message, Throwable cause )
+ public InvalidArtifactRTException( String groupId,
+ String artifactId,
+ String version,
+ String type,
+ String message,
+ Throwable cause )
{
super( cause );
-
+
this.groupId = groupId;
this.artifactId = artifactId;
this.version = version;
@@ -57,7 +66,7 @@
{
return "For artifact {" + getArtifactKey() + "}: " + getBaseMessage();
}
-
+
public String getBaseMessage()
{
return baseMessage;
@@ -82,7 +91,7 @@
{
return version;
}
-
+
public String getArtifactKey()
{
return groupId + ":" + artifactId + ":" + version + ":" + type;
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java Mon Nov 5 19:53:41 2007
@@ -43,8 +43,8 @@
}
protected InvalidRepositoryException( String message,
- String repositoryId,
- ComponentLookupException cause )
+ String repositoryId,
+ ComponentLookupException cause )
{
super( message, cause );
this.repositoryId = repositoryId;
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java Mon Nov 5 19:53:41 2007
@@ -9,7 +9,6 @@
* component in the current container.
*
* @author jdcasey
- *
*/
public class UnknownRepositoryLayoutException
extends InvalidRepositoryException
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java Mon Nov 5 19:53:41 2007
@@ -32,28 +32,33 @@
* Deploy an artifact from a particular directory. The artifact handler is used to determine the filename
* of the source file.
*
- * @param basedir the directory where the artifact is stored
- * @param finalName the name of the artifact sans extension
- * @param artifact the artifact definition
+ * @param basedir the directory where the artifact is stored
+ * @param finalName the name of the artifact sans extension
+ * @param artifact the artifact definition
* @param deploymentRepository the repository to deploy to
- * @param localRepository the local repository to install into
+ * @param localRepository the local repository to install into
* @throws ArtifactDeploymentException if an error occurred deploying the artifact
* @deprecated to be removed before 2.0 after the instlal/deploy plugins use the alternate method
*/
- void deploy( String basedir, String finalName, Artifact artifact, ArtifactRepository deploymentRepository,
+ void deploy( String basedir,
+ String finalName,
+ Artifact artifact,
+ ArtifactRepository deploymentRepository,
ArtifactRepository localRepository )
throws ArtifactDeploymentException;
/**
* Deploy an artifact from a particular file.
*
- * @param source the file to deploy
- * @param artifact the artifact definition
+ * @param source the file to deploy
+ * @param artifact the artifact definition
* @param deploymentRepository the repository to deploy to
- * @param localRepository the local repository to install into
+ * @param localRepository the local repository to install into
* @throws ArtifactDeploymentException if an error occurred deploying the artifact
*/
- void deploy( File source, Artifact artifact, ArtifactRepository deploymentRepository,
+ void deploy( File source,
+ Artifact artifact,
+ ArtifactRepository deploymentRepository,
ArtifactRepository localRepository )
throws ArtifactDeploymentException;
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeploymentException.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeploymentException.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeploymentException.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeploymentException.java Mon Nov 5 19:53:41 2007
@@ -36,7 +36,8 @@
super( cause );
}
- public ArtifactDeploymentException( String message, Throwable cause )
+ public ArtifactDeploymentException( String message,
+ Throwable cause )
{
super( message, cause );
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java Mon Nov 5 19:53:41 2007
@@ -44,10 +44,11 @@
private RepositoryMetadataManager repositoryMetadataManager;
- /**
- * @deprecated we want to use the artifact method only, and ensure artifact.file is set correctly.
- */
- public void deploy( String basedir, String finalName, Artifact artifact, ArtifactRepository deploymentRepository,
+ /** @deprecated we want to use the artifact method only, and ensure artifact.file is set correctly. */
+ public void deploy( String basedir,
+ String finalName,
+ Artifact artifact,
+ ArtifactRepository deploymentRepository,
ArtifactRepository localRepository )
throws ArtifactDeploymentException
{
@@ -56,7 +57,9 @@
deploy( source, artifact, deploymentRepository, localRepository );
}
- public void deploy( File source, Artifact artifact, ArtifactRepository deploymentRepository,
+ public void deploy( File source,
+ Artifact artifact,
+ ArtifactRepository deploymentRepository,
ArtifactRepository localRepository )
throws ArtifactDeploymentException
{
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java Mon Nov 5 19:53:41 2007
@@ -25,34 +25,75 @@
public interface ArtifactFactory
{
String ROLE = ArtifactFactory.class.getName();
-
- // TODO: deprecate and chase down (probably used for copying only)
- Artifact createArtifact( String groupId, String artifactId, String version, String scope, String type );
- Artifact createArtifactWithClassifier( String groupId, String artifactId, String version, String type,
+ // TODO: deprecate and chase down (probably used for copying only)
+ Artifact createArtifact( String groupId,
+ String artifactId,
+ String version,
+ String scope,
+ String type );
+
+ Artifact createArtifactWithClassifier( String groupId,
+ String artifactId,
+ String version,
+ String type,
String classifier );
- Artifact createDependencyArtifact( String groupId, String artifactId, VersionRange versionRange, String type,
- String classifier, String scope );
-
- Artifact createDependencyArtifact( String groupId, String artifactId, VersionRange versionRange, String type,
- String classifier, String scope, boolean optional );
-
- Artifact createDependencyArtifact( String groupId, String artifactId, VersionRange versionRange, String type,
- String classifier, String scope, String inheritedScope );
-
- Artifact createDependencyArtifact( String groupId, String artifactId, VersionRange versionRange, String type,
- String classifier, String scope, String inheritedScope, boolean optional );
-
- Artifact createBuildArtifact( String groupId, String artifactId, String version, String packaging );
-
- Artifact createProjectArtifact( String groupId, String artifactId, String version );
-
- Artifact createParentArtifact( String groupId, String artifactId, String version );
-
- Artifact createPluginArtifact( String groupId, String artifactId, VersionRange versionRange );
-
- Artifact createProjectArtifact( String groupId, String artifactId, String version, String scope );
-
- Artifact createExtensionArtifact( String groupId, String artifactId, VersionRange versionRange );
+ Artifact createDependencyArtifact( String groupId,
+ String artifactId,
+ VersionRange versionRange,
+ String type,
+ String classifier,
+ String scope );
+
+ Artifact createDependencyArtifact( String groupId,
+ String artifactId,
+ VersionRange versionRange,
+ String type,
+ String classifier,
+ String scope,
+ boolean optional );
+
+ Artifact createDependencyArtifact( String groupId,
+ String artifactId,
+ VersionRange versionRange,
+ String type,
+ String classifier,
+ String scope,
+ String inheritedScope );
+
+ Artifact createDependencyArtifact( String groupId,
+ String artifactId,
+ VersionRange versionRange,
+ String type,
+ String classifier,
+ String scope,
+ String inheritedScope,
+ boolean optional );
+
+ Artifact createBuildArtifact( String groupId,
+ String artifactId,
+ String version,
+ String packaging );
+
+ Artifact createProjectArtifact( String groupId,
+ String artifactId,
+ String version );
+
+ Artifact createParentArtifact( String groupId,
+ String artifactId,
+ String version );
+
+ Artifact createPluginArtifact( String groupId,
+ String artifactId,
+ VersionRange versionRange );
+
+ Artifact createProjectArtifact( String groupId,
+ String artifactId,
+ String version,
+ String scope );
+
+ Artifact createExtensionArtifact( String groupId,
+ String artifactId,
+ VersionRange versionRange );
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java Mon Nov 5 19:53:41 2007
@@ -35,73 +35,119 @@
{
}
- public Artifact createArtifact( String groupId, String artifactId, String version, String scope, String type )
+ public Artifact createArtifact( String groupId,
+ String artifactId,
+ String version,
+ String scope,
+ String type )
{
return createArtifact( groupId, artifactId, version, scope, type, null, null );
}
- public Artifact createArtifactWithClassifier( String groupId, String artifactId, String version, String type,
+ public Artifact createArtifactWithClassifier( String groupId,
+ String artifactId,
+ String version,
+ String type,
String classifier )
{
return createArtifact( groupId, artifactId, version, null, type, classifier, null );
}
- public Artifact createDependencyArtifact( String groupId, String artifactId, VersionRange versionRange, String type,
- String classifier, String scope )
+ public Artifact createDependencyArtifact( String groupId,
+ String artifactId,
+ VersionRange versionRange,
+ String type,
+ String classifier,
+ String scope )
{
return createArtifact( groupId, artifactId, versionRange, type, classifier, scope, null );
}
- public Artifact createDependencyArtifact( String groupId, String artifactId, VersionRange versionRange, String type,
- String classifier, String scope, boolean optional )
+ public Artifact createDependencyArtifact( String groupId,
+ String artifactId,
+ VersionRange versionRange,
+ String type,
+ String classifier,
+ String scope,
+ boolean optional )
{
return createArtifact( groupId, artifactId, versionRange, type, classifier, scope, null, optional );
}
- public Artifact createDependencyArtifact( String groupId, String artifactId, VersionRange versionRange, String type,
- String classifier, String scope, String inheritedScope )
+ public Artifact createDependencyArtifact( String groupId,
+ String artifactId,
+ VersionRange versionRange,
+ String type,
+ String classifier,
+ String scope,
+ String inheritedScope )
{
return createArtifact( groupId, artifactId, versionRange, type, classifier, scope, inheritedScope );
}
- public Artifact createDependencyArtifact( String groupId, String artifactId, VersionRange versionRange, String type,
- String classifier, String scope, String inheritedScope, boolean optional )
+ public Artifact createDependencyArtifact( String groupId,
+ String artifactId,
+ VersionRange versionRange,
+ String type,
+ String classifier,
+ String scope,
+ String inheritedScope,
+ boolean optional )
{
return createArtifact( groupId, artifactId, versionRange, type, classifier, scope, inheritedScope, optional );
}
- public Artifact createBuildArtifact( String groupId, String artifactId, String version, String packaging )
+ public Artifact createBuildArtifact( String groupId,
+ String artifactId,
+ String version,
+ String packaging )
{
return createArtifact( groupId, artifactId, version, null, packaging, null, null );
}
- public Artifact createProjectArtifact( String groupId, String artifactId, String version )
+ public Artifact createProjectArtifact( String groupId,
+ String artifactId,
+ String version )
{
return createProjectArtifact( groupId, artifactId, version, null );
}
- public Artifact createParentArtifact( String groupId, String artifactId, String version )
+ public Artifact createParentArtifact( String groupId,
+ String artifactId,
+ String version )
{
return createProjectArtifact( groupId, artifactId, version );
}
- public Artifact createPluginArtifact( String groupId, String artifactId, VersionRange versionRange )
+ public Artifact createPluginArtifact( String groupId,
+ String artifactId,
+ VersionRange versionRange )
{
return createArtifact( groupId, artifactId, versionRange, "maven-plugin", null, Artifact.SCOPE_RUNTIME, null );
}
- public Artifact createProjectArtifact( String groupId, String artifactId, String version, String scope )
+ public Artifact createProjectArtifact( String groupId,
+ String artifactId,
+ String version,
+ String scope )
{
return createArtifact( groupId, artifactId, version, scope, "pom" );
}
- public Artifact createExtensionArtifact( String groupId, String artifactId, VersionRange versionRange )
+ public Artifact createExtensionArtifact( String groupId,
+ String artifactId,
+ VersionRange versionRange )
{
return createArtifact( groupId, artifactId, versionRange, "jar", null, Artifact.SCOPE_RUNTIME, null );
}
- private Artifact createArtifact( String groupId, String artifactId, String version, String scope, String type,
- String classifier, String inheritedScope )
+ private Artifact createArtifact( String groupId,
+ String artifactId,
+ String version,
+ String scope,
+ String type,
+ String classifier,
+ String inheritedScope )
{
VersionRange versionRange = null;
if ( version != null )
@@ -111,14 +157,25 @@
return createArtifact( groupId, artifactId, versionRange, type, classifier, scope, inheritedScope );
}
- private Artifact createArtifact( String groupId, String artifactId, VersionRange versionRange, String type,
- String classifier, String scope, String inheritedScope )
+ private Artifact createArtifact( String groupId,
+ String artifactId,
+ VersionRange versionRange,
+ String type,
+ String classifier,
+ String scope,
+ String inheritedScope )
{
return createArtifact( groupId, artifactId, versionRange, type, classifier, scope, inheritedScope, false );
}
- private Artifact createArtifact( String groupId, String artifactId, VersionRange versionRange, String type,
- String classifier, String scope, String inheritedScope, boolean optional )
+ private Artifact createArtifact( String groupId,
+ String artifactId,
+ VersionRange versionRange,
+ String type,
+ String classifier,
+ String scope,
+ String inheritedScope,
+ boolean optional )
{
// TODO: can refactor - inherited scope calculation belongs in the collector, use scope handler
@@ -152,10 +209,10 @@
// system scopes come through unchanged...
desiredScope = Artifact.SCOPE_SYSTEM;
}
-
+
ArtifactHandler handler = artifactHandlerManager.getArtifactHandler( type );
return new DefaultArtifact( groupId, artifactId, versionRange, desiredScope, type, classifier, handler,
- optional );
+ optional );
}
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/installer/ArtifactInstallationException.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/installer/ArtifactInstallationException.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/installer/ArtifactInstallationException.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/installer/ArtifactInstallationException.java Mon Nov 5 19:53:41 2007
@@ -36,7 +36,8 @@
super( cause );
}
- public ArtifactInstallationException( String message, Throwable cause )
+ public ArtifactInstallationException( String message,
+ Throwable cause )
{
super( message, cause );
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java Mon Nov 5 19:53:41 2007
@@ -36,25 +36,30 @@
* Install an artifact from a particular directory. The artifact handler is used to determine the filename
* of the source file.
*
- * @param basedir the directory where the artifact is stored
- * @param finalName the name of the artifact sans extension
- * @param artifact the artifact definition
+ * @param basedir the directory where the artifact is stored
+ * @param finalName the name of the artifact sans extension
+ * @param artifact the artifact definition
* @param localRepository the local repository to install into
* @throws ArtifactInstallationException if an error occurred installing the artifact
* @deprecated to be removed before 2.0 after the instlal/deploy plugins use the alternate method
*/
- void install( String basedir, String finalName, Artifact artifact, ArtifactRepository localRepository )
+ void install( String basedir,
+ String finalName,
+ Artifact artifact,
+ ArtifactRepository localRepository )
throws ArtifactInstallationException;
/**
* Install an artifact from a particular file.
*
- * @param source the file to install
- * @param artifact the artifact definition
+ * @param source the file to install
+ * @param artifact the artifact definition
* @param localRepository the local repository to install into
* @throws ArtifactInstallationException if an error occurred installing the artifact
*/
- void install( File source, Artifact artifact, ArtifactRepository localRepository )
+ void install( File source,
+ Artifact artifact,
+ ArtifactRepository localRepository )
throws ArtifactInstallationException;
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java Mon Nov 5 19:53:41 2007
@@ -40,10 +40,11 @@
private RepositoryMetadataManager repositoryMetadataManager;
- /**
- * @deprecated we want to use the artifact method only, and ensure artifact.file is set correctly.
- */
- public void install( String basedir, String finalName, Artifact artifact, ArtifactRepository localRepository )
+ /** @deprecated we want to use the artifact method only, and ensure artifact.file is set correctly. */
+ public void install( String basedir,
+ String finalName,
+ Artifact artifact,
+ ArtifactRepository localRepository )
throws ArtifactInstallationException
{
String extension = artifact.getArtifactHandler().getExtension();
@@ -52,7 +53,9 @@
install( source, artifact, localRepository );
}
- public void install( File source, Artifact artifact, ArtifactRepository localRepository )
+ public void install( File source,
+ Artifact artifact,
+ ArtifactRepository localRepository )
throws ArtifactInstallationException
{
try
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/ChecksumFailedException.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/ChecksumFailedException.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/ChecksumFailedException.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/ChecksumFailedException.java Mon Nov 5 19:53:41 2007
@@ -27,14 +27,16 @@
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @version $Id$
*/
-public class ChecksumFailedException extends TransferFailedException
+public class ChecksumFailedException
+ extends TransferFailedException
{
public ChecksumFailedException( String s )
{
super( s );
}
-
- public ChecksumFailedException( String message, Throwable cause )
+
+ public ChecksumFailedException( String message,
+ Throwable cause )
{
super( message, cause );
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/CredentialsChangeRequest.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/CredentialsChangeRequest.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/CredentialsChangeRequest.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/CredentialsChangeRequest.java Mon Nov 5 19:53:41 2007
@@ -4,45 +4,53 @@
public class CredentialsChangeRequest
{
- private String resourceId;
- private AuthenticationInfo authInfo;
- private String oldPassword;
-
- public CredentialsChangeRequest()
- {
- }
-
- public CredentialsChangeRequest(String resourceId, AuthenticationInfo authInfo, String oldPassword)
- {
- super();
- this.resourceId = resourceId;
- this.authInfo = authInfo;
- this.oldPassword = oldPassword;
- }
- public String getResourceId()
- {
- return resourceId;
- }
- public void setResourceId(String resourceId)
- {
- this.resourceId = resourceId;
- }
- public AuthenticationInfo getAuthInfo()
- {
- return authInfo;
- }
- public void setAuthInfo(AuthenticationInfo authInfo)
- {
- this.authInfo = authInfo;
- }
- public String getOldPassword()
- {
- return oldPassword;
- }
- public void setOldPassword(String oldPassword)
- {
- this.oldPassword = oldPassword;
- }
-
-
+ private String resourceId;
+ private AuthenticationInfo authInfo;
+ private String oldPassword;
+
+ public CredentialsChangeRequest()
+ {
+ }
+
+ public CredentialsChangeRequest( String resourceId,
+ AuthenticationInfo authInfo,
+ String oldPassword )
+ {
+ super();
+ this.resourceId = resourceId;
+ this.authInfo = authInfo;
+ this.oldPassword = oldPassword;
+ }
+
+ public String getResourceId()
+ {
+ return resourceId;
+ }
+
+ public void setResourceId( String resourceId )
+ {
+ this.resourceId = resourceId;
+ }
+
+ public AuthenticationInfo getAuthInfo()
+ {
+ return authInfo;
+ }
+
+ public void setAuthInfo( AuthenticationInfo authInfo )
+ {
+ this.authInfo = authInfo;
+ }
+
+ public String getOldPassword()
+ {
+ return oldPassword;
+ }
+
+ public void setOldPassword( String oldPassword )
+ {
+ this.oldPassword = oldPassword;
+ }
+
+
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/CredentialsDataSource.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/CredentialsDataSource.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/CredentialsDataSource.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/CredentialsDataSource.java Mon Nov 5 19:53:41 2007
@@ -1,43 +1,44 @@
package org.apache.maven.artifact.manager;
import org.apache.maven.wagon.authentication.AuthenticationInfo;
+
/**
* A wrapper class around setting/retrieving/caching authentication
* info by resource ID. Typical usage - accessing server authentication for
- * by it's ID
- *
- * @author <a href="oleg@codehaus.org">Oleg Gusakov</a>
+ * by it's ID
*
+ * @author <a href="oleg@codehaus.org">Oleg Gusakov</a>
*/
public interface CredentialsDataSource
{
- public static final String ROLE = CredentialsDataSource.class.getName();
- /**
- * find, if not found, prompt and create Authentication info
- * for a given resource
- *
- * @param resourceId resource ID for which authentication is required
- * @return resource AuthenticationInfo. Should always exist.
- * @throws CredentialsDataSourceException
- */
- AuthenticationInfo get( String resourceId )
- throws CredentialsDataSourceException;
+ public static final String ROLE = CredentialsDataSource.class.getName();
+
+ /**
+ * find, if not found, prompt and create Authentication info
+ * for a given resource
+ *
+ * @param resourceId resource ID for which authentication is required
+ * @return resource AuthenticationInfo. Should always exist.
+ * @throws CredentialsDataSourceException
+ */
+ AuthenticationInfo get( String resourceId )
+ throws CredentialsDataSourceException;
- /**
- * set, if not found, prompt and create Authentication info
- * for a given resource. This one uses the old password
- * member of AuthenticationInfo
- *
- * @param resourceId resource ID for which authentication is required
- * @param authInfo authentication info to set for the given resource ID
- * @param oldPassword old password if one exists or <code>null</code> if not needed
- * - you know for sure that it's a new auth of the existing auth
- * does not have a password, associated with the resource, or you want the
- * old password to be prompted
- * @return
- * @throws CredentialsDataSourceException
- */
- void set( CredentialsChangeRequest req )
+ /**
+ * set, if not found, prompt and create Authentication info
+ * for a given resource. This one uses the old password
+ * member of AuthenticationInfo
+ *
+ * @param resourceId resource ID for which authentication is required
+ * @param authInfo authentication info to set for the given resource ID
+ * @param oldPassword old password if one exists or <code>null</code> if not needed
+ * - you know for sure that it's a new auth of the existing auth
+ * does not have a password, associated with the resource, or you want the
+ * old password to be prompted
+ * @return
+ * @throws CredentialsDataSourceException
+ */
+ void set( CredentialsChangeRequest req )
throws CredentialsDataSourceException;
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/CredentialsDataSourceException.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/CredentialsDataSourceException.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/CredentialsDataSourceException.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/CredentialsDataSourceException.java Mon Nov 5 19:53:41 2007
@@ -1,25 +1,27 @@
package org.apache.maven.artifact.manager;
-public class CredentialsDataSourceException extends Exception
+public class CredentialsDataSourceException
+ extends Exception
{
- public CredentialsDataSourceException()
- {
- }
+ public CredentialsDataSourceException()
+ {
+ }
- public CredentialsDataSourceException(String message)
- {
- super(message);
- }
+ public CredentialsDataSourceException( String message )
+ {
+ super( message );
+ }
- public CredentialsDataSourceException(Throwable cause)
- {
- super(cause);
- }
+ public CredentialsDataSourceException( Throwable cause )
+ {
+ super( cause );
+ }
- public CredentialsDataSourceException(String message, Throwable cause)
- {
- super(message, cause);
- }
+ public CredentialsDataSourceException( String message,
+ Throwable cause )
+ {
+ super( message, cause );
+ }
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java Mon Nov 5 19:53:41 2007
@@ -65,14 +65,15 @@
public class DefaultWagonManager
extends AbstractLogEnabled
- implements WagonManager, Contextualizable
+ implements WagonManager,
+ Contextualizable
{
private static final String WILDCARD = "*";
- private static final String[] CHECKSUM_IDS = { "md5", "sha1" };
+ private static final String[] CHECKSUM_IDS = {"md5", "sha1"};
/** have to match the CHECKSUM_IDS */
- private static final String[] CHECKSUM_ALGORITHMS = { "MD5", "SHA-1" };
+ private static final String[] CHECKSUM_ALGORITHMS = {"MD5", "SHA-1"};
private PlexusContainer container;
@@ -86,9 +87,7 @@
private Map mirrors = new HashMap();
- /**
- * Map( String, XmlPlexusConfiguration ) with the repository id and the wagon configuration
- */
+ /** Map( String, XmlPlexusConfiguration ) with the repository id and the wagon configuration */
private Map serverConfigurationMap = new HashMap();
private TransferListener downloadMonitor;
@@ -103,11 +102,9 @@
private RepositoryPermissions defaultRepositoryPermissions;
- /**
- * encapsulates access to Server credentials
- */
+ /** encapsulates access to Server credentials */
private CredentialsDataSource credentialsDataSource;
-
+
// TODO: this leaks the component in the public api - it is never released back to the container
public Wagon getWagon( Repository repository )
throws UnsupportedProtocolException, WagonConfigurationException
@@ -134,7 +131,7 @@
if ( wagon == null )
{
throw new UnsupportedProtocolException(
- "Cannot find wagon which supports the requested protocol: " + protocol );
+ "Cannot find wagon which supports the requested protocol: " + protocol );
}
wagon.setInteractive( interactive );
@@ -142,20 +139,26 @@
return wagon;
}
- public void putArtifact( File source, Artifact artifact, ArtifactRepository deploymentRepository )
+ public void putArtifact( File source,
+ Artifact artifact,
+ ArtifactRepository deploymentRepository )
throws TransferFailedException
{
putRemoteFile( deploymentRepository, source, deploymentRepository.pathOf( artifact ), downloadMonitor );
}
- public void putArtifactMetadata( File source, ArtifactMetadata artifactMetadata, ArtifactRepository repository )
+ public void putArtifactMetadata( File source,
+ ArtifactMetadata artifactMetadata,
+ ArtifactRepository repository )
throws TransferFailedException
{
getLogger().info( "Uploading " + artifactMetadata );
putRemoteFile( repository, source, repository.pathOfRemoteRepositoryMetadata( artifactMetadata ), null );
}
- private void putRemoteFile( ArtifactRepository repository, File source, String remotePath,
+ private void putRemoteFile( ArtifactRepository repository,
+ File source,
+ String remotePath,
TransferListener downloadMonitor )
throws TransferFailedException
{
@@ -198,7 +201,8 @@
if ( serverPermissionsMap.containsKey( repository.getId() ) )
{
- RepositoryPermissions perms = (RepositoryPermissions) serverPermissionsMap.get( repository.getId() );
+ RepositoryPermissions perms = (RepositoryPermissions) serverPermissionsMap.get(
+ repository.getId() );
getLogger().debug(
"adding permissions to wagon connection: " + perms.getFileMode() + " " + perms.getDirectoryMode() );
@@ -213,11 +217,13 @@
wagon.connect( artifactRepository, getAuthenticationInfo( repository.getId() ), getProxy( protocol ) );
wagon.put( source, remotePath );
- } catch (CredentialsDataSourceException e) {
- String err = "Problem with server credentials: "+e.getMessage();
+ }
+ catch ( CredentialsDataSourceException e )
+ {
+ String err = "Problem with server credentials: " + e.getMessage();
getLogger().error( err );
- throw new TransferFailedException(err);
- }
+ throw new TransferFailedException( err );
+ }
finally
{
if ( downloadMonitor != null )
@@ -285,7 +291,8 @@
}
}
- private ChecksumObserver addChecksumObserver( Wagon wagon, String algorithm )
+ private ChecksumObserver addChecksumObserver( Wagon wagon,
+ String algorithm )
throws TransferFailedException
{
try
@@ -300,7 +307,8 @@
}
}
- public void getArtifact( Artifact artifact, List remoteRepositories )
+ public void getArtifact( Artifact artifact,
+ List remoteRepositories )
throws TransferFailedException, ResourceDoesNotExistException
{
// TODO [BP]: The exception handling here needs some work
@@ -337,7 +345,8 @@
}
}
- public void getArtifact( Artifact artifact, ArtifactRepository repository )
+ public void getArtifact( Artifact artifact,
+ ArtifactRepository repository )
throws TransferFailedException, ResourceDoesNotExistException
{
String remotePath = repository.pathOf( artifact );
@@ -357,14 +366,16 @@
getLogger().debug( "Trying repository " + repository.getId() );
getRemoteFile( repository, artifact.getFile(), remotePath, downloadMonitor, policy.getChecksumPolicy(),
- false );
+ false );
getLogger().debug( " Artifact resolved" );
artifact.setResolved( true );
}
}
- public void getArtifactMetadata( ArtifactMetadata metadata, ArtifactRepository repository, File destination,
+ public void getArtifactMetadata( ArtifactMetadata metadata,
+ ArtifactRepository repository,
+ File destination,
String checksumPolicy )
throws TransferFailedException, ResourceDoesNotExistException
{
@@ -373,8 +384,12 @@
getRemoteFile( repository, destination, remotePath, null, checksumPolicy, true );
}
- private void getRemoteFile( ArtifactRepository repository, File destination, String remotePath,
- TransferListener downloadMonitor, String checksumPolicy, boolean force )
+ private void getRemoteFile( ArtifactRepository repository,
+ File destination,
+ String remotePath,
+ TransferListener downloadMonitor,
+ String checksumPolicy,
+ boolean force )
throws TransferFailedException, ResourceDoesNotExistException
{
// TODO: better excetpions - transfer failed is not enough?
@@ -386,8 +401,8 @@
if ( mirror != null )
{
repository = repositoryFactory.createArtifactRepository( mirror.getId(), mirror.getUrl(),
- repository.getLayout(), repository.getSnapshots(),
- repository.getReleases() );
+ repository.getLayout(), repository.getSnapshots(),
+ repository.getReleases() );
}
String protocol = repository.getProtocol();
@@ -426,7 +441,7 @@
try
{
wagon.connect( new Repository( repository.getId(), repository.getUrl() ),
- getAuthenticationInfo( repository.getId() ), getProxy( protocol ) );
+ getAuthenticationInfo( repository.getId() ), getProxy( protocol ) );
boolean firstRun = true;
boolean retry = true;
@@ -520,7 +535,7 @@
{
// this was a failed transfer, and we don't want to retry.
handleChecksumFailure( checksumPolicy, "Error retrieving checksum file for " + remotePath,
- md5TryException );
+ md5TryException );
}
}
@@ -546,9 +561,11 @@
catch ( AuthorizationException e )
{
throw new TransferFailedException( "Authorization failed: " + e.getMessage(), e );
- } catch (CredentialsDataSourceException e) {
+ }
+ catch ( CredentialsDataSourceException e )
+ {
throw new TransferFailedException( "Retrieving credentials failed: " + e.getMessage(), e );
- }
+ }
finally
{
// Remove every TransferListener
@@ -603,7 +620,9 @@
}
}
- private void handleChecksumFailure( String checksumPolicy, String message, Throwable cause )
+ private void handleChecksumFailure( String checksumPolicy,
+ String message,
+ Throwable cause )
throws ChecksumFailedException
{
if ( ArtifactRepositoryPolicy.CHECKSUM_POLICY_FAIL.equals( checksumPolicy ) )
@@ -618,8 +637,12 @@
// otherwise it is ignore
}
- private void verifyChecksum( ChecksumObserver checksumObserver, File destination, File tempDestination,
- String remotePath, String checksumFileExtension, Wagon wagon )
+ private void verifyChecksum( ChecksumObserver checksumObserver,
+ File destination,
+ File tempDestination,
+ String remotePath,
+ String checksumFileExtension,
+ Wagon wagon )
throws ResourceDoesNotExistException, TransferFailedException, AuthorizationException
{
try
@@ -686,7 +709,8 @@
}
}
- private void releaseWagon( String protocol, Wagon wagon )
+ private void releaseWagon( String protocol,
+ Wagon wagon )
{
try
{
@@ -705,12 +729,12 @@
}
public AuthenticationInfo getAuthenticationInfo( String id )
- throws CredentialsDataSourceException
+ throws CredentialsDataSourceException
{
- return credentialsDataSource == null
- ? (AuthenticationInfo) authenticationInfoMap.get( id )
- : credentialsDataSource.get(id)
- ;
+ return credentialsDataSource == null
+ ? (AuthenticationInfo) authenticationInfoMap.get( id )
+ : credentialsDataSource.get( id )
+ ;
}
public ArtifactRepository getMirror( String mirrorOf )
@@ -737,7 +761,11 @@
* property format: <code>*.foo.com|localhost</code>.
* @todo [BP] would be nice to configure this via plexus in some way
*/
- public void addProxy( String protocol, String host, int port, String username, String password,
+ public void addProxy( String protocol,
+ String host,
+ int port,
+ String username,
+ String password,
String nonProxyHosts )
{
ProxyInfo proxyInfo = new ProxyInfo();
@@ -757,9 +785,7 @@
container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY );
}
- /**
- * @todo I'd rather not be setting this explicitly.
- */
+ /** @todo I'd rather not be setting this explicitly. */
public void setDownloadMonitor( TransferListener downloadMonitor )
{
this.downloadMonitor = downloadMonitor;
@@ -769,11 +795,15 @@
// library from the 2.0.x code so that we aren't maintaining two lines of code
// for the artifact management.
public void addAuthenticationInfo( String repositoryId
- , String username
- , String password
- , String privateKey
- , String passphrase
- )
+ ,
+ String username
+ ,
+ String password
+ ,
+ String privateKey
+ ,
+ String passphrase
+ )
{
AuthenticationInfo authInfo = new AuthenticationInfo();
authInfo.setUserName( username );
@@ -787,26 +817,32 @@
// This is the new way of handling authentication that will allow us to help users setup
// authentication requirements.
public void addAuthenticationCredentials( String repositoryId
- , String username
- , String password
- , String privateKey
- , String passphrase
- )
- throws CredentialsDataSourceException
+ ,
+ String username
+ ,
+ String password
+ ,
+ String privateKey
+ ,
+ String passphrase
+ )
+ throws CredentialsDataSourceException
{
AuthenticationInfo authInfo = new AuthenticationInfo();
authInfo.setUserName( username );
authInfo.setPassword( password );
authInfo.setPrivateKey( privateKey );
authInfo.setPassphrase( passphrase );
-
- if( credentialsDataSource == null )
- authenticationInfoMap.put( repositoryId, authInfo );
+
+ if ( credentialsDataSource == null )
+ authenticationInfoMap.put( repositoryId, authInfo );
else
- credentialsDataSource.set( new CredentialsChangeRequest( repositoryId, authInfo, null ) );
+ credentialsDataSource.set( new CredentialsChangeRequest( repositoryId, authInfo, null ) );
}
- public void addPermissionInfo( String repositoryId, String filePermissions, String directoryPermissions )
+ public void addPermissionInfo( String repositoryId,
+ String filePermissions,
+ String directoryPermissions )
{
RepositoryPermissions permissions = new RepositoryPermissions();
@@ -830,7 +866,9 @@
}
}
- public void addMirror( String id, String mirrorOf, String url )
+ public void addMirror( String id,
+ String mirrorOf,
+ String url )
{
ArtifactRepository mirror = new DefaultArtifactRepository( id, url, null );
@@ -866,10 +904,9 @@
}
}
- /**
- * @deprecated Wagons are discovered in plugin and extension realms now.
- */
- public void registerWagons( Collection wagons, PlexusContainer extensionContainer )
+ /** @deprecated Wagons are discovered in plugin and extension realms now. */
+ public void registerWagons( Collection wagons,
+ PlexusContainer extensionContainer )
{
}
@@ -880,13 +917,15 @@
* @param repository the repository that has the configuration
* @throws WagonConfigurationException wraps any error given during configuration of the wagon instance
*/
- private void configureWagon( Wagon wagon, ArtifactRepository repository )
+ private void configureWagon( Wagon wagon,
+ ArtifactRepository repository )
throws WagonConfigurationException
{
configureWagon( wagon, repository.getId() );
}
- private void configureWagon( Wagon wagon, String repositoryId )
+ private void configureWagon( Wagon wagon,
+ String repositoryId )
throws WagonConfigurationException
{
if ( serverConfigurationMap.containsKey( repositoryId ) )
@@ -922,7 +961,8 @@
}
}
- public void addConfiguration( String repositoryId, Xpp3Dom configuration )
+ public void addConfiguration( String repositoryId,
+ Xpp3Dom configuration )
{
if ( ( repositoryId == null ) || ( configuration == null ) )
{
@@ -939,10 +979,10 @@
this.defaultRepositoryPermissions = defaultRepositoryPermissions;
}
- public void registerCredentialsDataSource(CredentialsDataSource cds)
- {
- this.credentialsDataSource = cds;
- }
-
-
+ public void registerCredentialsDataSource( CredentialsDataSource cds )
+ {
+ this.credentialsDataSource = cds;
+ }
+
+
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java Mon Nov 5 19:53:41 2007
@@ -25,33 +25,36 @@
public class WagonConfigurationException
extends TransferFailedException
{
-
+
static final long serialVersionUID = 1;
private final String originalMessage;
private final String repositoryId;
- public WagonConfigurationException( String repositoryId, String message, Throwable cause )
+ public WagonConfigurationException( String repositoryId,
+ String message,
+ Throwable cause )
{
super( "While configuring wagon for \'" + repositoryId + "\': " + message, cause );
-
+
this.repositoryId = repositoryId;
this.originalMessage = message;
}
- public WagonConfigurationException( String repositoryId, String message )
+ public WagonConfigurationException( String repositoryId,
+ String message )
{
super( "While configuring wagon for \'" + repositoryId + "\': " + message );
-
+
this.repositoryId = repositoryId;
this.originalMessage = message;
}
-
+
public final String getRepositoryId()
{
return repositoryId;
}
-
+
public final String getOriginalMessage()
{
return originalMessage;
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/metadata/AbstractArtifactMetadata.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/metadata/AbstractArtifactMetadata.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/metadata/AbstractArtifactMetadata.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/metadata/AbstractArtifactMetadata.java Mon Nov 5 19:53:41 2007
@@ -51,16 +51,16 @@
{
return artifact.getArtifactId();
}
-
+
public String extendedToString()
{
StringBuffer buffer = new StringBuffer();
-
+
buffer.append( "\nArtifact Metadata\n--------------------------" );
buffer.append( "\nGroupId: " ).append( getGroupId() );
buffer.append( "\nArtifactId: " ).append( getArtifactId() );
- buffer.append( "\nMetadata Type: " ).append(getClass().getName() );
-
+ buffer.append( "\nMetadata Type: " ).append( getClass().getName() );
+
return buffer.toString();
}
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadata.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadata.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadata.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadata.java Mon Nov 5 19:53:41 2007
@@ -32,14 +32,10 @@
*/
public interface ArtifactMetadata
{
- /**
- * Whether this metadata should be stored alongside the artifact.
- */
+ /** Whether this metadata should be stored alongside the artifact. */
boolean storedInArtifactVersionDirectory();
- /**
- * Whether this metadata should be stored alongside the group.
- */
+ /** Whether this metadata should be stored alongside the group. */
boolean storedInGroupDirectory();
String getGroupId();
@@ -76,11 +72,12 @@
/**
* Store the metadata in the local repository.
*
- * @param localRepository the local repository
+ * @param localRepository the local repository
* @param remoteRepository the remote repository it came from
* @todo this should only be needed on the repository metadata
*/
- void storeInLocalRepository( ArtifactRepository localRepository, ArtifactRepository remoteRepository )
+ void storeInLocalRepository( ArtifactRepository localRepository,
+ ArtifactRepository remoteRepository )
throws RepositoryMetadataStoreException;
String extendedToString();
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataRetrievalException.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataRetrievalException.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataRetrievalException.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataRetrievalException.java Mon Nov 5 19:53:41 2007
@@ -23,7 +23,7 @@
/**
* Error while retrieving repository metadata from the repository.
- *
+ *
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id$
*/
@@ -33,31 +33,28 @@
private Artifact artifact;
- /**
- * @deprecated use {@link #ArtifactMetadataRetrievalException(String, Throwable, Artifact)}
- */
+ /** @deprecated use {@link #ArtifactMetadataRetrievalException(String, Throwable, Artifact)} */
public ArtifactMetadataRetrievalException( String message )
{
this( message, null, null );
}
- /**
- * @deprecated use {@link #ArtifactMetadataRetrievalException(String, Throwable, Artifact)}
- */
+ /** @deprecated use {@link #ArtifactMetadataRetrievalException(String, Throwable, Artifact)} */
public ArtifactMetadataRetrievalException( Throwable cause )
{
this( null, cause, null );
}
- /**
- * @deprecated use {@link #ArtifactMetadataRetrievalException(String, Throwable, Artifact)}
- */
- public ArtifactMetadataRetrievalException( String message, Throwable cause )
+ /** @deprecated use {@link #ArtifactMetadataRetrievalException(String, Throwable, Artifact)} */
+ public ArtifactMetadataRetrievalException( String message,
+ Throwable cause )
{
this( message, cause, null );
}
- public ArtifactMetadataRetrievalException( String message, Throwable cause, Artifact artifact )
+ public ArtifactMetadataRetrievalException( String message,
+ Throwable cause,
+ Artifact artifact )
{
super( message, cause );
this.artifact = artifact;