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 [3/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...
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/ConflictResolverFactory.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/ConflictResolverFactory.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/ConflictResolverFactory.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/ConflictResolverFactory.java Mon Nov 5 19:53:41 2007
@@ -21,31 +21,29 @@
/**
* A factory that produces conflict resolvers of various types.
- *
+ *
* @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
* @version $Id$
- * @since 3.0
* @see ConflictResolver
+ * @since 3.0
*/
public interface ConflictResolverFactory
{
// constants --------------------------------------------------------------
-
- /**
- * The plexus role for this component.
- */
+
+ /** The plexus role for this component. */
String ROLE = ConflictResolverFactory.class.getName();
-
+
// methods ----------------------------------------------------------------
-
+
/**
* Gets a conflict resolver of the specified type.
- *
- * @param type
- * the type of conflict resolver to obtain
+ *
+ * @param type the type of conflict resolver to obtain
* @return the conflict resolver
* @throws ConflictResolverNotFoundException
- * if the specified type was not found
+ * if the specified type was not found
*/
- ConflictResolver getConflictResolver( String type ) throws ConflictResolverNotFoundException;
+ ConflictResolver getConflictResolver( String type )
+ throws ConflictResolverNotFoundException;
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/ConflictResolverNotFoundException.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/ConflictResolverNotFoundException.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/ConflictResolverNotFoundException.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/ConflictResolverNotFoundException.java Mon Nov 5 19:53:41 2007
@@ -21,27 +21,25 @@
/**
* Indicates that a specified conflict resolver implementation could not be found.
- *
+ *
* @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
* @version $Id$
* @since 3.0
*/
-public class ConflictResolverNotFoundException extends Exception
+public class ConflictResolverNotFoundException
+ extends Exception
{
// constants --------------------------------------------------------------
- /**
- * The serial version ID.
- */
+ /** The serial version ID. */
private static final long serialVersionUID = 3372412184339653914L;
// constructors -----------------------------------------------------------
/**
* Creates a new <code>ConflictResolverNotFoundException</code> with the specified message.
- *
- * @param message
- * the message
+ *
+ * @param message the message
*/
public ConflictResolverNotFoundException( String message )
{
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultConflictResolver.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultConflictResolver.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultConflictResolver.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultConflictResolver.java Mon Nov 5 19:53:41 2007
@@ -21,7 +21,7 @@
/**
* The default conflict resolver that delegates to the nearest strategy.
- *
+ *
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id$
* @see NearestConflictResolver
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultConflictResolverFactory.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultConflictResolverFactory.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultConflictResolverFactory.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultConflictResolverFactory.java Mon Nov 5 19:53:41 2007
@@ -28,26 +28,28 @@
/**
* A conflict resolver factory that obtains instances from a plexus container.
- *
+ *
* @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
* @version $Id$
* @since 3.0
*/
-public class DefaultConflictResolverFactory implements ConflictResolverFactory, Contextualizable
+public class DefaultConflictResolverFactory
+ implements ConflictResolverFactory,
+ Contextualizable
{
// fields -----------------------------------------------------------------
- /**
- * The plexus container used to obtain instances from.
- */
+ /** The plexus container used to obtain instances from. */
private PlexusContainer container;
-
+
// ConflictResolverFactory methods ----------------------------------------
-
+
/*
- * @see org.apache.maven.artifact.resolver.conflict.ConflictResolverFactory#getConflictResolver(java.lang.String)
- */
- public ConflictResolver getConflictResolver( String type ) throws ConflictResolverNotFoundException
+ * @see org.apache.maven.artifact.resolver.conflict.ConflictResolverFactory#getConflictResolver(java.lang.String)
+ */
+
+ public ConflictResolver getConflictResolver( String type )
+ throws ConflictResolverNotFoundException
{
try
{
@@ -64,7 +66,9 @@
/*
* @see org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable#contextualize(org.codehaus.plexus.context.Context)
*/
- public void contextualize( Context context ) throws ContextException
+
+ public void contextualize( Context context )
+ throws ContextException
{
container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY );
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/FarthestConflictResolver.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/FarthestConflictResolver.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/FarthestConflictResolver.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/FarthestConflictResolver.java Mon Nov 5 19:53:41 2007
@@ -24,7 +24,7 @@
/**
* Resolves conflicting artifacts by always selecting the <em>farthest</em> declaration. Farthest is defined as the
* declaration that has the most transitive steps away from the project being built.
- *
+ *
* @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
* @version $Id$
* @since 3.0
@@ -33,12 +33,14 @@
implements ConflictResolver
{
// ConflictResolver methods -----------------------------------------------
-
+
/*
- * @see org.apache.maven.artifact.resolver.conflict.ConflictResolver#resolveConflict(org.apache.maven.artifact.resolver.ResolutionNode,
- * org.apache.maven.artifact.resolver.ResolutionNode)
- */
- public ResolutionNode resolveConflict( ResolutionNode node1, ResolutionNode node2 )
+ * @see org.apache.maven.artifact.resolver.conflict.ConflictResolver#resolveConflict(org.apache.maven.artifact.resolver.ResolutionNode,
+ * org.apache.maven.artifact.resolver.ResolutionNode)
+ */
+
+ public ResolutionNode resolveConflict( ResolutionNode node1,
+ ResolutionNode node2 )
{
return node1.getDepth() >= node2.getDepth() ? node1 : node2;
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/NearestConflictResolver.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/NearestConflictResolver.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/NearestConflictResolver.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/NearestConflictResolver.java Mon Nov 5 19:53:41 2007
@@ -24,7 +24,7 @@
/**
* Resolves conflicting artifacts by always selecting the <em>nearest</em> declaration. Nearest is defined as the
* declaration that has the least transitive steps away from the project being built.
- *
+ *
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
* @version $Id$
@@ -34,12 +34,14 @@
implements ConflictResolver
{
// ConflictResolver methods -----------------------------------------------
-
+
/*
- * @see org.apache.maven.artifact.resolver.conflict.ConflictResolver#resolveConflict(org.apache.maven.artifact.resolver.ResolutionNode,
- * org.apache.maven.artifact.resolver.ResolutionNode)
- */
- public ResolutionNode resolveConflict( ResolutionNode node1, ResolutionNode node2 )
+ * @see org.apache.maven.artifact.resolver.conflict.ConflictResolver#resolveConflict(org.apache.maven.artifact.resolver.ResolutionNode,
+ * org.apache.maven.artifact.resolver.ResolutionNode)
+ */
+
+ public ResolutionNode resolveConflict( ResolutionNode node1,
+ ResolutionNode node2 )
{
return node1.getDepth() <= node2.getDepth() ? node1 : node2;
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/NewestConflictResolver.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/NewestConflictResolver.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/NewestConflictResolver.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/NewestConflictResolver.java Mon Nov 5 19:53:41 2007
@@ -26,7 +26,7 @@
/**
* Resolves conflicting artifacts by always selecting the <em>newest</em> declaration. Newest is defined as the
* declaration whose version is greater according to <code>ArtifactVersion.compareTo</code>.
- *
+ *
* @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
* @version $Id$
* @see ArtifactVersion#compareTo(Object)
@@ -36,24 +36,26 @@
implements ConflictResolver
{
// ConflictResolver methods -----------------------------------------------
-
+
/*
- * @see org.apache.maven.artifact.resolver.conflict.ConflictResolver#resolveConflict(org.apache.maven.artifact.resolver.ResolutionNode,
- * org.apache.maven.artifact.resolver.ResolutionNode)
- */
- public ResolutionNode resolveConflict( ResolutionNode node1, ResolutionNode node2 )
+ * @see org.apache.maven.artifact.resolver.conflict.ConflictResolver#resolveConflict(org.apache.maven.artifact.resolver.ResolutionNode,
+ * org.apache.maven.artifact.resolver.ResolutionNode)
+ */
+
+ public ResolutionNode resolveConflict( ResolutionNode node1,
+ ResolutionNode node2 )
{
try
{
ArtifactVersion version1 = node1.getArtifact().getSelectedVersion();
ArtifactVersion version2 = node2.getArtifact().getSelectedVersion();
-
+
return version1.compareTo( version2 ) > 0 ? node1 : node2;
}
- catch (OverConstrainedVersionException exception)
+ catch ( OverConstrainedVersionException exception )
{
// TODO: log message or throw exception?
-
+
return null;
}
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/OldestConflictResolver.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/OldestConflictResolver.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/OldestConflictResolver.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/OldestConflictResolver.java Mon Nov 5 19:53:41 2007
@@ -26,7 +26,7 @@
/**
* Resolves conflicting artifacts by always selecting the <em>oldest</em> declaration. Oldest is defined as the
* declaration whose version is less according to <code>ArtifactVersion.compareTo</code>.
- *
+ *
* @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
* @version $Id$
* @see ArtifactVersion#compareTo(Object)
@@ -36,24 +36,26 @@
implements ConflictResolver
{
// ConflictResolver methods -----------------------------------------------
-
+
/*
- * @see org.apache.maven.artifact.resolver.conflict.ConflictResolver#resolveConflict(org.apache.maven.artifact.resolver.ResolutionNode,
- * org.apache.maven.artifact.resolver.ResolutionNode)
- */
- public ResolutionNode resolveConflict( ResolutionNode node1, ResolutionNode node2 )
+ * @see org.apache.maven.artifact.resolver.conflict.ConflictResolver#resolveConflict(org.apache.maven.artifact.resolver.ResolutionNode,
+ * org.apache.maven.artifact.resolver.ResolutionNode)
+ */
+
+ public ResolutionNode resolveConflict( ResolutionNode node1,
+ ResolutionNode node2 )
{
try
{
ArtifactVersion version1 = node1.getArtifact().getSelectedVersion();
ArtifactVersion version2 = node2.getArtifact().getSelectedVersion();
-
+
return version1.compareTo( version2 ) <= 0 ? node1 : node2;
}
- catch (OverConstrainedVersionException exception)
+ catch ( OverConstrainedVersionException exception )
{
// TODO: log message or throw exception?
-
+
return null;
}
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java Mon Nov 5 19:53:41 2007
@@ -24,7 +24,7 @@
public class InversionArtifactFilter
implements ArtifactFilter
{
-
+
private final ArtifactFilter toInvert;
public InversionArtifactFilter( ArtifactFilter toInvert )
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/filter/TypeArtifactFilter.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/filter/TypeArtifactFilter.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/filter/TypeArtifactFilter.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/filter/TypeArtifactFilter.java Mon Nov 5 19:53:41 2007
@@ -21,9 +21,7 @@
import org.apache.maven.artifact.Artifact;
-/**
- * Artifact Filter which filters on artifact type
- */
+/** Artifact Filter which filters on artifact type */
public class TypeArtifactFilter
implements ArtifactFilter
{
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java Mon Nov 5 19:53:41 2007
@@ -8,134 +8,182 @@
/** @author Oleg Gusakov */
public class ArtifactMetadata
{
- protected String groupId;
- protected String artifactId;
- protected String version;
- protected String type;
- protected ArtifactScopeEnum scope;
- protected String classifier;
- protected String uri;
-
- protected boolean resolved = false;
- //------------------------------------------------------------------
- public ArtifactMetadata( String groupId, String name, String version )
- {
- this( groupId, name, version, null );
- }
- //------------------------------------------------------------------
- public ArtifactMetadata( String groupId, String name, String version, String type )
- {
- this( groupId, name, version, type, null );
- }
- //------------------------------------------------------------------
- public ArtifactMetadata( String groupId, String name, String version, String type, ArtifactScopeEnum scope )
- {
- this( groupId, name, version, type, scope, null );
- }
- //------------------------------------------------------------------
- public ArtifactMetadata( String groupId, String name, String version, String type, ArtifactScopeEnum scope, String classifier )
- {
- this.groupId = groupId;
- this.artifactId = name;
- this.version = version;
- this.type = type;
- this.scope = scope;
- this.classifier = classifier;
- }
- //------------------------------------------------------------------
- public ArtifactMetadata( Artifact af )
- {
- if( af != null )
- init( af );
- }
- //------------------------------------------------------------------
- public void init( Artifact af )
- {
- setGroupId(af.getGroupId());
- setArtifactId(af.getArtifactId());
- setVersion(af.getVersion());
- setType(af.getType());
- setScope( af.getScope() );
- setClassifier( af.getClassifier() );
- setUri( af.getDownloadUrl() );
-
- this.resolved = af.isResolved();
- }
- //------------------------------------------------------------------
- @Override
- public String toString()
- {
- return groupId+":"+artifactId+":"+version;
- }
- //------------------------------------------------------------------
- public String toDomainString()
- {
- return groupId+":"+artifactId;
- }
- //------------------------------------------------------------------
- public String getGroupId() {
- return groupId;
- }
- public void setGroupId(String groupId) {
- this.groupId = groupId;
- }
- public String getArtifactId() {
- return artifactId;
- }
- public void setArtifactId(String name) {
- this.artifactId = name;
- }
- public String getVersion() {
- return version;
- }
- public void setVersion(String version) {
- this.version = version;
- }
- public String getType() {
- return type;
- }
- public void setType(String type) {
- this.type = type;
- }
-
- public ArtifactScopeEnum getScope()
- {
- return scope == null ? ArtifactScopeEnum.DEFAULT_SCOPE : scope;
- }
- public void setScope(ArtifactScopeEnum scope)
- {
- this.scope = scope;
- }
- public void setScope(String scope)
- {
- this.scope = scope == null
- ? ArtifactScopeEnum.DEFAULT_SCOPE
- : ArtifactScopeEnum.valueOf(scope)
- ;
- }
- public String getClassifier() {
- return classifier;
- }
- public void setClassifier(String classifier) {
- this.classifier = classifier;
- }
- public boolean isResolved()
- {
- return resolved;
- }
- public void setResolved(boolean resolved)
- {
- this.resolved = resolved;
- }
- public String getUri()
- {
- return uri;
- }
- public void setUri(String uri)
- {
- this.uri = uri;
- }
-
- //------------------------------------------------------------------
- //------------------------------------------------------------------
+ protected String groupId;
+ protected String artifactId;
+ protected String version;
+ protected String type;
+ protected ArtifactScopeEnum scope;
+ protected String classifier;
+ protected String uri;
+
+ protected boolean resolved = false;
+
+ //------------------------------------------------------------------
+ public ArtifactMetadata( String groupId,
+ String name,
+ String version )
+ {
+ this( groupId, name, version, null );
+ }
+
+ //------------------------------------------------------------------
+ public ArtifactMetadata( String groupId,
+ String name,
+ String version,
+ String type )
+ {
+ this( groupId, name, version, type, null );
+ }
+
+ //------------------------------------------------------------------
+ public ArtifactMetadata( String groupId,
+ String name,
+ String version,
+ String type,
+ ArtifactScopeEnum scope )
+ {
+ this( groupId, name, version, type, scope, null );
+ }
+
+ //------------------------------------------------------------------
+ public ArtifactMetadata( String groupId,
+ String name,
+ String version,
+ String type,
+ ArtifactScopeEnum scope,
+ String classifier )
+ {
+ this.groupId = groupId;
+ this.artifactId = name;
+ this.version = version;
+ this.type = type;
+ this.scope = scope;
+ this.classifier = classifier;
+ }
+
+ //------------------------------------------------------------------
+ public ArtifactMetadata( Artifact af )
+ {
+ if ( af != null )
+ init( af );
+ }
+
+ //------------------------------------------------------------------
+ public void init( Artifact af )
+ {
+ setGroupId( af.getGroupId() );
+ setArtifactId( af.getArtifactId() );
+ setVersion( af.getVersion() );
+ setType( af.getType() );
+ setScope( af.getScope() );
+ setClassifier( af.getClassifier() );
+ setUri( af.getDownloadUrl() );
+
+ this.resolved = af.isResolved();
+ }
+
+ //------------------------------------------------------------------
+ @Override
+ public String toString()
+ {
+ return groupId + ":" + artifactId + ":" + version;
+ }
+
+ //------------------------------------------------------------------
+ public String toDomainString()
+ {
+ return groupId + ":" + artifactId;
+ }
+
+ //------------------------------------------------------------------
+ public String getGroupId()
+ {
+ return groupId;
+ }
+
+ public void setGroupId( String groupId )
+ {
+ this.groupId = groupId;
+ }
+
+ public String getArtifactId()
+ {
+ return artifactId;
+ }
+
+ public void setArtifactId( String name )
+ {
+ this.artifactId = name;
+ }
+
+ public String getVersion()
+ {
+ return version;
+ }
+
+ public void setVersion( String version )
+ {
+ this.version = version;
+ }
+
+ public String getType()
+ {
+ return type;
+ }
+
+ public void setType( String type )
+ {
+ this.type = type;
+ }
+
+ public ArtifactScopeEnum getScope()
+ {
+ return scope == null ? ArtifactScopeEnum.DEFAULT_SCOPE : scope;
+ }
+
+ public void setScope( ArtifactScopeEnum scope )
+ {
+ this.scope = scope;
+ }
+
+ public void setScope( String scope )
+ {
+ this.scope = scope == null
+ ? ArtifactScopeEnum.DEFAULT_SCOPE
+ : ArtifactScopeEnum.valueOf( scope )
+ ;
+ }
+
+ public String getClassifier()
+ {
+ return classifier;
+ }
+
+ public void setClassifier( String classifier )
+ {
+ this.classifier = classifier;
+ }
+
+ public boolean isResolved()
+ {
+ return resolved;
+ }
+
+ public void setResolved( boolean resolved )
+ {
+ this.resolved = resolved;
+ }
+
+ public String getUri()
+ {
+ return uri;
+ }
+
+ public void setUri( String uri )
+ {
+ this.uri = uri;
+ }
+
+ //------------------------------------------------------------------
+ //------------------------------------------------------------------
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultMetadataResolver.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultMetadataResolver.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultMetadataResolver.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultMetadataResolver.java Mon Nov 5 19:53:41 2007
@@ -15,117 +15,141 @@
/** @author Oleg Gusakov */
public class DefaultMetadataResolver
-extends AbstractLogEnabled
-implements MetadataResolver
+ extends AbstractLogEnabled
+ implements MetadataResolver
{
//------------------------------------------------------------------------
- ArtifactResolver ar;
- ArtifactFactory af;
- ArtifactMetadataSource ams;
+ ArtifactResolver ar;
+ ArtifactFactory af;
+ ArtifactMetadataSource ams;
+
//------------------------------------------------------------------------
public MetadataResolutionResult resolveMetadata( MetadataResolutionRequest req )
- throws MetadataResolutionException
+ throws MetadataResolutionException
{
- try {
- getLogger().debug("Received request for: "+req.getQuery() );
- MetadataResolutionResult res = new MetadataResolutionResult();
- if( req.type == null ) {
- throw new MetadataResolutionException("no type in the request");
- }
-
- MetadataTreeNode tree = resolveTree( req, null );
- MetadataGraph graph = null;
-
- if( MetadataResolutionRequestTypeEnum.tree.equals(req.type) ) {
- res.setTree( tree );
- }
- if( MetadataResolutionRequestTypeEnum.graph.equals(req.type) ) {
- graph = new MetadataGraph( tree );
- res.setTree(tree);
- res.setGraph(graph);
- }
-
- return res;
- } catch( MetadataResolutionException mrEx ) {
- throw mrEx;
- } catch( Exception anyEx ) {
- anyEx.printStackTrace();
- throw new MetadataResolutionException(anyEx);
- }
+ try
+ {
+ getLogger().debug( "Received request for: " + req.getQuery() );
+ MetadataResolutionResult res = new MetadataResolutionResult();
+ if ( req.type == null )
+ {
+ throw new MetadataResolutionException( "no type in the request" );
+ }
+
+ MetadataTreeNode tree = resolveTree( req, null );
+ MetadataGraph graph = null;
+
+ if ( MetadataResolutionRequestTypeEnum.tree.equals( req.type ) )
+ {
+ res.setTree( tree );
+ }
+ if ( MetadataResolutionRequestTypeEnum.graph.equals( req.type ) )
+ {
+ graph = new MetadataGraph( tree );
+ res.setTree( tree );
+ res.setGraph( graph );
+ }
+
+ return res;
+ }
+ catch ( MetadataResolutionException mrEx )
+ {
+ throw mrEx;
+ }
+ catch ( Exception anyEx )
+ {
+ anyEx.printStackTrace();
+ throw new MetadataResolutionException( anyEx );
+ }
}
+
//------------------------------------------------------------------------
- private MetadataTreeNode resolveTree( MetadataResolutionRequest req, MetadataTreeNode parent )
- throws MetadataResolutionException
+ private MetadataTreeNode resolveTree( MetadataResolutionRequest req,
+ MetadataTreeNode parent )
+ throws MetadataResolutionException
{
- try {
- ArtifactMetadata query = req.getQuery();
- Artifact pomArtifact = af.createArtifact(
- query.getGroupId()
- , query.getArtifactId()
- , query.getVersion()
- , null
- , "pom"
- );
-getLogger().debug("resolveMetadata request:"
- + "\n> artifact : "+pomArtifact.toString()
- + "\n> remoteRepos: "+req.getRemoteRepositories()
- + "\n> localRepo : "+req.getLocalRepository()
- );
-String error = null;
- try {
- ArtifactResolutionRequest arr = new ArtifactResolutionRequest();
- arr.setArtifact(pomArtifact);
- arr.setLocalRepository(req.getLocalRepository());
- arr.setRemoteRepostories(req.getRemoteRepositories());
- ar.resolve( pomArtifact
- , req.getRemoteRepositories()
- , req.getLocalRepository()
- );
-if( !pomArtifact.isResolved() ) {
- getLogger().info("*************> Did not resolve "+pomArtifact.toString()
-+"\nURL: "+pomArtifact.getDownloadUrl()
-+"\nRepos: "+req.getRemoteRepositories()
-+"\nLocal: "+req.getLocalRepository()
-);
-}
- } catch ( ArtifactResolutionException are ) {
- pomArtifact.setResolved(false);
-error = are.getMessage();
- } catch( ArtifactNotFoundException anfe ) {
- pomArtifact.setResolved(false);
-error = anfe.getMessage();
- }
-
-if( error != null ) {
-getLogger().info("*************> Did not resolve "+pomArtifact.toString()
-+"\nRepos: "+req.getRemoteRepositories()
-+"\nLocal: "+req.getLocalRepository()
-+"\nerror: "+error
-);
-}
- if( pomArtifact.isResolved() ) {
- ResolutionGroup rg = ams.retrieve( pomArtifact, req.getLocalRepository(), req.getRemoteRepositories() );
- MetadataTreeNode node = new MetadataTreeNode( pomArtifact, parent, true, query.getScope() );
- Set<Artifact> dependencies = (Set<Artifact>)rg.getArtifacts();
- if( dependencies != null && dependencies.size() > 0 )
- {
- ArrayList<MetadataTreeNode> kids = new ArrayList<MetadataTreeNode>( dependencies.size() );
- for( Artifact a : dependencies ) {
- req.query.init( a );
- req.query.setType("pom");
- kids.add( resolveTree( req, node ) );
- }
- node.addChildren(kids);
- }
- return node;
- }
- else {
- return new MetadataTreeNode( pomArtifact, parent, false, query.getScope() );
- }
- } catch( Exception anyEx ) {
- anyEx.printStackTrace();
- throw new MetadataResolutionException(anyEx);
- }
+ try
+ {
+ ArtifactMetadata query = req.getQuery();
+ Artifact pomArtifact = af.createArtifact(
+ query.getGroupId()
+ , query.getArtifactId()
+ , query.getVersion()
+ , null
+ , "pom"
+ );
+ getLogger().debug( "resolveMetadata request:"
+ + "\n> artifact : " + pomArtifact.toString()
+ + "\n> remoteRepos: " + req.getRemoteRepositories()
+ + "\n> localRepo : " + req.getLocalRepository()
+ );
+ String error = null;
+ try
+ {
+ ArtifactResolutionRequest arr = new ArtifactResolutionRequest();
+ arr.setArtifact( pomArtifact );
+ arr.setLocalRepository( req.getLocalRepository() );
+ arr.setRemoteRepostories( req.getRemoteRepositories() );
+ ar.resolve( pomArtifact
+ , req.getRemoteRepositories()
+ , req.getLocalRepository()
+ );
+ if ( !pomArtifact.isResolved() )
+ {
+ getLogger().info( "*************> Did not resolve " + pomArtifact.toString()
+ + "\nURL: " + pomArtifact.getDownloadUrl()
+ + "\nRepos: " + req.getRemoteRepositories()
+ + "\nLocal: " + req.getLocalRepository()
+ );
+ }
+ }
+ catch ( ArtifactResolutionException are )
+ {
+ pomArtifact.setResolved( false );
+ error = are.getMessage();
+ }
+ catch ( ArtifactNotFoundException anfe )
+ {
+ pomArtifact.setResolved( false );
+ error = anfe.getMessage();
+ }
+
+ if ( error != null )
+ {
+ getLogger().info( "*************> Did not resolve " + pomArtifact.toString()
+ + "\nRepos: " + req.getRemoteRepositories()
+ + "\nLocal: " + req.getLocalRepository()
+ + "\nerror: " + error
+ );
+ }
+ if ( pomArtifact.isResolved() )
+ {
+ ResolutionGroup rg = ams.retrieve( pomArtifact, req.getLocalRepository(), req.getRemoteRepositories() );
+ MetadataTreeNode node = new MetadataTreeNode( pomArtifact, parent, true, query.getScope() );
+ Set<Artifact> dependencies = (Set<Artifact>) rg.getArtifacts();
+ if ( dependencies != null && dependencies.size() > 0 )
+ {
+ ArrayList<MetadataTreeNode> kids = new ArrayList<MetadataTreeNode>( dependencies.size() );
+ for ( Artifact a : dependencies )
+ {
+ req.query.init( a );
+ req.query.setType( "pom" );
+ kids.add( resolveTree( req, node ) );
+ }
+ node.addChildren( kids );
+ }
+ return node;
+ }
+ else
+ {
+ return new MetadataTreeNode( pomArtifact, parent, false, query.getScope() );
+ }
+ }
+ catch ( Exception anyEx )
+ {
+ anyEx.printStackTrace();
+ throw new MetadataResolutionException( anyEx );
+ }
}
//------------------------------------------------------------------------
//------------------------------------------------------------------------
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java Mon Nov 5 19:53:41 2007
@@ -9,108 +9,127 @@
public class MetadataGraph
{
- MetadataGraphVertice entry;
- Map< String, MetadataGraphVertice > vertices;
- Map< String, List<MetadataGraphEdge> > edges;
- //------------------------------------------------------------------------
- public MetadataGraph( MetadataTreeNode tree )
- throws MetadataResolutionException
- {
- if( tree == null )
- throw new MetadataResolutionException("tree is null");
-
- int count = countNodes(tree);
- vertices = new HashMap<String, MetadataGraphVertice>( count );
- edges = new HashMap<String, List<MetadataGraphEdge>>( count + (count/2) );
-
- processNodes( null, tree, 0 );
- }
- //------------------------------------------------------------------------
- private void processNodes( MetadataGraphVertice parentVertice, MetadataTreeNode node, int depth )
- throws MetadataResolutionException
- {
- if( node == null )
- return;
-
- String nodeHash = node.graphHash();
- MetadataGraphVertice vertice = vertices.get(nodeHash);
- if( vertice == null ) { // does not exist yet ?
- vertice = new MetadataGraphVertice( node.md );
- vertices.put( nodeHash, vertice );
- }
-
- if( parentVertice != null ) { // then create links
- String edgeId = edgeHash( parentVertice, vertice );
- List<MetadataGraphEdge> edgeList = edges.get(edgeId);
- if( edgeList == null ) {
- edgeList = new ArrayList<MetadataGraphEdge>(4);
- edges.put( edgeId, edgeList );
- }
-
- MetadataGraphEdge e = new MetadataGraphEdge( node.md.version, node.md.scope, depth );
- if( !edgeList.contains(e) ) {
- edgeList.add(e);
- } else {
- e = null;
- }
- }
-
- MetadataTreeNode [] kids = node.getChildren();
- if( kids == null || kids.length < 1 )
- return;
-
- for( MetadataTreeNode n : kids )
- processNodes( vertice, n, depth+1 );
- }
- //------------------------------------------------------------------------
- public static String edgeHash( MetadataGraphVertice v1, MetadataGraphVertice v2 )
- {
- return v1.md.toDomainString()+">"+v2.md.toDomainString();
+ MetadataGraphVertice entry;
+ Map<String, MetadataGraphVertice> vertices;
+ Map<String, List<MetadataGraphEdge>> edges;
+
+ //------------------------------------------------------------------------
+ public MetadataGraph( MetadataTreeNode tree )
+ throws MetadataResolutionException
+ {
+ if ( tree == null )
+ throw new MetadataResolutionException( "tree is null" );
+
+ int count = countNodes( tree );
+ vertices = new HashMap<String, MetadataGraphVertice>( count );
+ edges = new HashMap<String, List<MetadataGraphEdge>>( count + ( count / 2 ) );
+
+ processNodes( null, tree, 0 );
+ }
+
+ //------------------------------------------------------------------------
+ private void processNodes( MetadataGraphVertice parentVertice,
+ MetadataTreeNode node,
+ int depth )
+ throws MetadataResolutionException
+ {
+ if ( node == null )
+ return;
+
+ String nodeHash = node.graphHash();
+ MetadataGraphVertice vertice = vertices.get( nodeHash );
+ if ( vertice == null )
+ { // does not exist yet ?
+ vertice = new MetadataGraphVertice( node.md );
+ vertices.put( nodeHash, vertice );
+ }
+
+ if ( parentVertice != null )
+ { // then create links
+ String edgeId = edgeHash( parentVertice, vertice );
+ List<MetadataGraphEdge> edgeList = edges.get( edgeId );
+ if ( edgeList == null )
+ {
+ edgeList = new ArrayList<MetadataGraphEdge>( 4 );
+ edges.put( edgeId, edgeList );
+ }
+
+ MetadataGraphEdge e = new MetadataGraphEdge( node.md.version, node.md.scope, depth );
+ if ( !edgeList.contains( e ) )
+ {
+ edgeList.add( e );
+ }
+ else
+ {
+ e = null;
+ }
+ }
+
+ MetadataTreeNode[] kids = node.getChildren();
+ if ( kids == null || kids.length < 1 )
+ return;
+
+ for ( MetadataTreeNode n : kids )
+ processNodes( vertice, n, depth + 1 );
+ }
+
+ //------------------------------------------------------------------------
+ public static String edgeHash( MetadataGraphVertice v1,
+ MetadataGraphVertice v2 )
+ {
+ return v1.md.toDomainString() + ">" + v2.md.toDomainString();
// return h1.compareTo(h2) > 0
// ? h1.hashCode()+""+h2.hashCode()
// : h2.hashCode()+""+h1.hashCode()
// ;
- }
- //------------------------------------------------------------------------
- private static int countNodes(MetadataTreeNode tree )
- {
- if( tree == null )
- return 0;
-
- int count = 1;
- MetadataTreeNode [] kids = tree.getChildren();
- if( kids == null || kids.length < 1 )
- return count;
- for( MetadataTreeNode n : kids )
- count += countNodes(n);
-
- return count;
- }
- //------------------------------------------------------------------------
- public MetadataGraphVertice getEntry()
- {
- return entry;
- }
- public void setEntry(MetadataGraphVertice entry)
- {
- this.entry = entry;
- }
- public Map<String, MetadataGraphVertice> getVertices()
- {
- return vertices;
- }
- public void setVertices(Map<String, MetadataGraphVertice> vertices)
- {
- this.vertices = vertices;
- }
- public Map<String, List<MetadataGraphEdge>> getEdges()
- {
- return edges;
- }
- public void setEdges(Map<String, List<MetadataGraphEdge>> edges)
- {
- this.edges = edges;
- }
- //------------------------------------------------------------------------
- //------------------------------------------------------------------------
+ }
+
+ //------------------------------------------------------------------------
+ private static int countNodes( MetadataTreeNode tree )
+ {
+ if ( tree == null )
+ return 0;
+
+ int count = 1;
+ MetadataTreeNode[] kids = tree.getChildren();
+ if ( kids == null || kids.length < 1 )
+ return count;
+ for ( MetadataTreeNode n : kids )
+ count += countNodes( n );
+
+ return count;
+ }
+
+ //------------------------------------------------------------------------
+ public MetadataGraphVertice getEntry()
+ {
+ return entry;
+ }
+
+ public void setEntry( MetadataGraphVertice entry )
+ {
+ this.entry = entry;
+ }
+
+ public Map<String, MetadataGraphVertice> getVertices()
+ {
+ return vertices;
+ }
+
+ public void setVertices( Map<String, MetadataGraphVertice> vertices )
+ {
+ this.vertices = vertices;
+ }
+
+ public Map<String, List<MetadataGraphEdge>> getEdges()
+ {
+ return edges;
+ }
+
+ public void setEdges( Map<String, List<MetadataGraphEdge>> edges )
+ {
+ this.edges = edges;
+ }
+ //------------------------------------------------------------------------
+ //------------------------------------------------------------------------
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java Mon Nov 5 19:53:41 2007
@@ -5,60 +5,78 @@
/** @author Oleg Gusakov */
public class MetadataGraphEdge
{
- String version;
- ArtifactScopeEnum scope;
- int depth = -1;
-
- public MetadataGraphEdge(String version, ArtifactScopeEnum scope, int depth)
- {
- super();
- this.version = version;
- this.scope = scope;
- this.depth = depth;
- }
- //----------------------------------------------------------------------------
- private static boolean objectsEqual( Object o1, Object o2 )
- {
- if( o1 == null && o2 == null )
- return true;
- if( (o1 == null && o2 != null)
- || (o1 != null && o2 == null)
- ) return false;
- return o1.equals(o2);
- }
- //----------------------------------------------------------------------------
- @Override
- public boolean equals(Object o)
- {
- if( o instanceof MetadataGraphEdge ) {
- MetadataGraphEdge e = (MetadataGraphEdge) o;
- return
- objectsEqual(version, e.version )
- && objectsEqual(scope, e.scope)
- && depth == e.depth
- ;
- }
- return false;
- }
- //----------------------------------------------------------------------------
- public String getVersion() {
- return version;
- }
- public void setVersion(String version) {
- this.version = version;
- }
- public ArtifactScopeEnum getScope() {
- return scope;
- }
- public void setScope(ArtifactScopeEnum scope) {
- this.scope = scope;
- }
- public int getDepth() {
- return depth;
- }
- public void setDepth(int depth) {
- this.depth = depth;
- }
- //----------------------------------------------------------------------------
- //----------------------------------------------------------------------------
+ String version;
+ ArtifactScopeEnum scope;
+ int depth = -1;
+
+ public MetadataGraphEdge( String version,
+ ArtifactScopeEnum scope,
+ int depth )
+ {
+ super();
+ this.version = version;
+ this.scope = scope;
+ this.depth = depth;
+ }
+
+ //----------------------------------------------------------------------------
+ private static boolean objectsEqual( Object o1,
+ Object o2 )
+ {
+ if ( o1 == null && o2 == null )
+ return true;
+ if ( ( o1 == null && o2 != null )
+ || ( o1 != null && o2 == null )
+ ) return false;
+ return o1.equals( o2 );
+ }
+
+ //----------------------------------------------------------------------------
+ @Override
+ public boolean equals( Object o )
+ {
+ if ( o instanceof MetadataGraphEdge )
+ {
+ MetadataGraphEdge e = (MetadataGraphEdge) o;
+ return
+ objectsEqual( version, e.version )
+ && objectsEqual( scope, e.scope )
+ && depth == e.depth
+ ;
+ }
+ return false;
+ }
+
+ //----------------------------------------------------------------------------
+ public String getVersion()
+ {
+ return version;
+ }
+
+ public void setVersion( String version )
+ {
+ this.version = version;
+ }
+
+ public ArtifactScopeEnum getScope()
+ {
+ return scope;
+ }
+
+ public void setScope( ArtifactScopeEnum scope )
+ {
+ this.scope = scope;
+ }
+
+ public int getDepth()
+ {
+ return depth;
+ }
+
+ public void setDepth( int depth )
+ {
+ this.depth = depth;
+ }
+ //----------------------------------------------------------------------------
+ //----------------------------------------------------------------------------
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertice.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertice.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertice.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertice.java Mon Nov 5 19:53:41 2007
@@ -3,22 +3,22 @@
/** @author Oleg Gusakov */
public class MetadataGraphVertice
{
- ArtifactMetadata md;
+ ArtifactMetadata md;
- public MetadataGraphVertice(ArtifactMetadata md)
- {
- super();
- this.md = md;
- }
+ public MetadataGraphVertice( ArtifactMetadata md )
+ {
+ super();
+ this.md = md;
+ }
- public ArtifactMetadata getMd()
- {
- return md;
- }
+ public ArtifactMetadata getMd()
+ {
+ return md;
+ }
- public void setMd(ArtifactMetadata md)
- {
- this.md = md;
- }
+ public void setMd( ArtifactMetadata md )
+ {
+ this.md = md;
+ }
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java Mon Nov 5 19:53:41 2007
@@ -1,24 +1,31 @@
package org.apache.maven.artifact.resolver.metadata;
-public class MetadataResolutionException extends Exception {
+public class MetadataResolutionException
+ extends Exception
+{
- public MetadataResolutionException() {
- // TODO Auto-generated constructor stub
- }
+ public MetadataResolutionException()
+ {
+ // TODO Auto-generated constructor stub
+ }
- public MetadataResolutionException(String message) {
- super(message);
- // TODO Auto-generated constructor stub
- }
+ public MetadataResolutionException( String message )
+ {
+ super( message );
+ // TODO Auto-generated constructor stub
+ }
- public MetadataResolutionException(Throwable cause) {
- super(cause);
- // TODO Auto-generated constructor stub
- }
+ public MetadataResolutionException( Throwable cause )
+ {
+ super( cause );
+ // TODO Auto-generated constructor stub
+ }
- public MetadataResolutionException(String message, Throwable cause) {
- super(message, cause);
- // TODO Auto-generated constructor stub
- }
+ public MetadataResolutionException( String message,
+ Throwable cause )
+ {
+ super( message, cause );
+ // TODO Auto-generated constructor stub
+ }
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequest.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequest.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequest.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequest.java Mon Nov 5 19:53:41 2007
@@ -8,45 +8,59 @@
/** @author Oleg Gusakov */
public class MetadataResolutionRequest
{
- protected ArtifactMetadata query;
- protected MetadataResolutionRequestTypeEnum type;
-
- protected ArtifactRepository localRepository;
- protected List<ArtifactRepository> remoteRepositories;
-
- //--------------------------------------------------------------------
- public MetadataResolutionRequest()
- {
- }
- //--------------------------------------------------------------------
- public MetadataResolutionRequest(MetadataResolutionRequestTypeEnum type, ArtifactMetadata query, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
- {
- this.type = type;
- this.query = query;
- this.localRepository = localRepository;
- this.remoteRepositories = remoteRepositories;
- }
- //--------------------------------------------------------------------
- public ArtifactMetadata getQuery()
- {
- return query;
- }
- public void setQuery(ArtifactMetadata query)
- {
- this.query = query;
- }
- public ArtifactRepository getLocalRepository() {
- return localRepository;
- }
- public void setLocalRepository(ArtifactRepository localRepository) {
- this.localRepository = localRepository;
- }
- public List<ArtifactRepository> getRemoteRepositories() {
- return remoteRepositories;
- }
- public void setRemoteRepositories(List<ArtifactRepository> remoteRepositories) {
- this.remoteRepositories = remoteRepositories;
- }
- //--------------------------------------------------------------------
- //--------------------------------------------------------------------
+ protected ArtifactMetadata query;
+ protected MetadataResolutionRequestTypeEnum type;
+
+ protected ArtifactRepository localRepository;
+ protected List<ArtifactRepository> remoteRepositories;
+
+ //--------------------------------------------------------------------
+ public MetadataResolutionRequest()
+ {
+ }
+
+ //--------------------------------------------------------------------
+ public MetadataResolutionRequest( MetadataResolutionRequestTypeEnum type,
+ ArtifactMetadata query,
+ ArtifactRepository localRepository,
+ List<ArtifactRepository> remoteRepositories )
+ {
+ this.type = type;
+ this.query = query;
+ this.localRepository = localRepository;
+ this.remoteRepositories = remoteRepositories;
+ }
+
+ //--------------------------------------------------------------------
+ public ArtifactMetadata getQuery()
+ {
+ return query;
+ }
+
+ public void setQuery( ArtifactMetadata query )
+ {
+ this.query = query;
+ }
+
+ public ArtifactRepository getLocalRepository()
+ {
+ return localRepository;
+ }
+
+ public void setLocalRepository( ArtifactRepository localRepository )
+ {
+ this.localRepository = localRepository;
+ }
+
+ public List<ArtifactRepository> getRemoteRepositories()
+ {
+ return remoteRepositories;
+ }
+
+ public void setRemoteRepositories( List<ArtifactRepository> remoteRepositories )
+ {
+ this.remoteRepositories = remoteRepositories;
+ }
+ //--------------------------------------------------------------------
+ //--------------------------------------------------------------------
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java Mon Nov 5 19:53:41 2007
@@ -2,22 +2,18 @@
public enum MetadataResolutionRequestTypeEnum
{
- tree(1)
- , graph(2)
- , noConflictGraph(3)
- , subGraph(4)
- ;
+ tree( 1 ), graph( 2 ), noConflictGraph( 3 ), subGraph( 4 );
- private int id;
+ private int id;
- // Constructor
- MetadataResolutionRequestTypeEnum( int id )
- {
- this.id = id;
- }
+ // Constructor
+ MetadataResolutionRequestTypeEnum( int id )
+ {
+ this.id = id;
+ }
- int getId()
- {
- return id;
- }
+ int getId()
+ {
+ return id;
+ }
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java Mon Nov 5 19:53:41 2007
@@ -5,33 +5,41 @@
/** @author Oleg Gusakov */
public class MetadataResolutionResult
{
- MetadataTreeNode root;
- MetadataGraph graph;
- //----------------------------------------------------------------------------
- public MetadataResolutionResult()
- {
- }
- //----------------------------------------------------------------------------
- public MetadataResolutionResult( MetadataTreeNode root )
- {
- this.root = root;
- }
- //----------------------------------------------------------------------------
- public MetadataTreeNode getTree() {
- return root;
- }
- public void setTree(MetadataTreeNode root) {
- this.root = root;
- }
- public MetadataGraph getGraph()
- {
- return graph;
- }
- public void setGraph(MetadataGraph graph)
- {
- this.graph = graph;
- }
-
- //----------------------------------------------------------------------------
- //----------------------------------------------------------------------------
+ MetadataTreeNode root;
+ MetadataGraph graph;
+
+ //----------------------------------------------------------------------------
+ public MetadataResolutionResult()
+ {
+ }
+
+ //----------------------------------------------------------------------------
+ public MetadataResolutionResult( MetadataTreeNode root )
+ {
+ this.root = root;
+ }
+
+ //----------------------------------------------------------------------------
+ public MetadataTreeNode getTree()
+ {
+ return root;
+ }
+
+ public void setTree( MetadataTreeNode root )
+ {
+ this.root = root;
+ }
+
+ public MetadataGraph getGraph()
+ {
+ return graph;
+ }
+
+ public void setGraph( MetadataGraph graph )
+ {
+ this.graph = graph;
+ }
+
+ //----------------------------------------------------------------------------
+ //----------------------------------------------------------------------------
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolver.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolver.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolver.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolver.java Mon Nov 5 19:53:41 2007
@@ -6,5 +6,5 @@
String ROLE = MetadataResolver.class.getName();
MetadataResolutionResult resolveMetadata( MetadataResolutionRequest request )
- throws MetadataResolutionException;
+ throws MetadataResolutionException;
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java Mon Nov 5 19:53:41 2007
@@ -7,96 +7,119 @@
public class MetadataTreeNode
{
- ArtifactMetadata md; // this node
-
- MetadataTreeNode parent; // papa of cause
- MetadataTreeNode [] children; // of cause
-
- boolean resolved = false; // if current node was resolved
- //------------------------------------------------------------------------
- public MetadataTreeNode()
- {
- }
- //------------------------------------------------------------------------
- public MetadataTreeNode( ArtifactMetadata md, MetadataTreeNode parent, boolean resolved, ArtifactScopeEnum scope )
- {
- if( md != null )
- md.setScope(scope);
-
- this.md = md;
- this.parent = parent;
- this.resolved = resolved;
- }
- //------------------------------------------------------------------------
- public MetadataTreeNode( Artifact af, MetadataTreeNode parent, boolean resolved, ArtifactScopeEnum scope )
- {
- this( new ArtifactMetadata(af), parent, resolved, scope );
- }
- //------------------------------------------------------------------------
- public void addChildren( List<MetadataTreeNode> kidList )
- {
- if( kidList == null || kidList.size() < 1)
- return;
-
- children = new MetadataTreeNode[ kidList.size() ];
- int i = 0;
- for( MetadataTreeNode n : kidList )
- children[i++] = n;
- }
- //------------------------------------------------------------------
- @Override
- public String toString()
- {
- return md == null ? "no metadata" : md.toString();
- }
- //------------------------------------------------------------------
- public String graphHash()
- throws MetadataResolutionException
- {
- if( md == null )
- throw new MetadataResolutionException("treenode without metadata, parent: "
- + ( parent==null?"null": parent.toString() )
- );
-
- return md.groupId+":"+md.artifactId;
- }
- //------------------------------------------------------------------------
- public boolean hasChildren()
- {
- return children != null;
- }
- //------------------------------------------------------------------------
- public ArtifactMetadata getMd()
- {
- return md;
- }
- public void setMd(ArtifactMetadata md)
- {
- this.md = md;
- }
- public MetadataTreeNode getParent()
- {
- return parent;
- }
- public void setParent(MetadataTreeNode parent)
- {
- this.parent = parent;
- }
- public boolean isResolved()
- {
- return resolved;
- }
- public void setResolved(boolean resolved)
- {
- this.resolved = resolved;
- }
- public MetadataTreeNode[] getChildren() {
- return children;
- }
- public void setChildren(MetadataTreeNode[] children) {
- this.children = children;
- }
-
+ ArtifactMetadata md; // this node
+
+ MetadataTreeNode parent; // papa of cause
+ MetadataTreeNode[] children; // of cause
+
+ boolean resolved = false; // if current node was resolved
+
+ //------------------------------------------------------------------------
+ public MetadataTreeNode()
+ {
+ }
+
+ //------------------------------------------------------------------------
+ public MetadataTreeNode( ArtifactMetadata md,
+ MetadataTreeNode parent,
+ boolean resolved,
+ ArtifactScopeEnum scope )
+ {
+ if ( md != null )
+ md.setScope( scope );
+
+ this.md = md;
+ this.parent = parent;
+ this.resolved = resolved;
+ }
+
+ //------------------------------------------------------------------------
+ public MetadataTreeNode( Artifact af,
+ MetadataTreeNode parent,
+ boolean resolved,
+ ArtifactScopeEnum scope )
+ {
+ this( new ArtifactMetadata( af ), parent, resolved, scope );
+ }
+
+ //------------------------------------------------------------------------
+ public void addChildren( List<MetadataTreeNode> kidList )
+ {
+ if ( kidList == null || kidList.size() < 1 )
+ return;
+
+ children = new MetadataTreeNode[kidList.size()];
+ int i = 0;
+ for ( MetadataTreeNode n : kidList )
+ children[i++] = n;
+ }
+
+ //------------------------------------------------------------------
+ @Override
+ public String toString()
+ {
+ return md == null ? "no metadata" : md.toString();
+ }
+
+ //------------------------------------------------------------------
+ public String graphHash()
+ throws MetadataResolutionException
+ {
+ if ( md == null )
+ throw new MetadataResolutionException( "treenode without metadata, parent: "
+ + ( parent == null ? "null" : parent.toString() )
+ );
+
+ return md.groupId + ":" + md.artifactId;
+ }
+
+ //------------------------------------------------------------------------
+ public boolean hasChildren()
+ {
+ return children != null;
+ }
+
+ //------------------------------------------------------------------------
+ public ArtifactMetadata getMd()
+ {
+ return md;
+ }
+
+ public void setMd( ArtifactMetadata md )
+ {
+ this.md = md;
+ }
+
+ public MetadataTreeNode getParent()
+ {
+ return parent;
+ }
+
+ public void setParent( MetadataTreeNode parent )
+ {
+ this.parent = parent;
+ }
+
+ public boolean isResolved()
+ {
+ return resolved;
+ }
+
+ public void setResolved( boolean resolved )
+ {
+ this.resolved = resolved;
+ }
+
+ public MetadataTreeNode[] getChildren()
+ {
+ return children;
+ }
+
+ public void setChildren( MetadataTreeNode[] children )
+ {
+ this.children = children;
+ }
+
//------------------------------------------------------------------------
//------------------------------------------------------------------------
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java Mon Nov 5 19:53:41 2007
@@ -48,7 +48,9 @@
protected WagonManager wagonManager;
- protected String resolveVersion( Artifact artifact, ArtifactRepository localRepository, List remoteRepositories )
+ protected String resolveVersion( Artifact artifact,
+ ArtifactRepository localRepository,
+ List remoteRepositories )
throws RepositoryMetadataResolutionException
{
RepositoryMetadata metadata;
@@ -105,5 +107,6 @@
return version;
}
- protected abstract String constructVersion( Versioning versioning, String baseVersion );
+ protected abstract String constructVersion( Versioning versioning,
+ String baseVersion );
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java Mon Nov 5 19:53:41 2007
@@ -41,32 +41,36 @@
* Take in a artifact and return the transformed artifact for locating in the remote repository. If no
* transformation has occured the original artifact is returned.
*
- * @param artifact Artifact to be transformed.
+ * @param artifact Artifact to be transformed.
* @param remoteRepositories the repositories to check
- * @param localRepository the local repository
+ * @param localRepository the local repository
*/
- void transformForResolve( Artifact artifact, List remoteRepositories, ArtifactRepository localRepository )
+ void transformForResolve( Artifact artifact,
+ List remoteRepositories,
+ ArtifactRepository localRepository )
throws ArtifactResolutionException, ArtifactNotFoundException;
/**
* Take in a artifact and return the transformed artifact for locating in the local repository. If no
* transformation has occured the original artifact is returned.
*
- * @param artifact Artifact to be transformed.
+ * @param artifact Artifact to be transformed.
* @param localRepository the local repository it will be stored in
*/
- void transformForInstall( Artifact artifact, ArtifactRepository localRepository )
+ void transformForInstall( Artifact artifact,
+ ArtifactRepository localRepository )
throws ArtifactInstallationException;
/**
* Take in a artifact and return the transformed artifact for distributing toa remote repository. If no
* transformation has occured the original artifact is returned.
*
- * @param artifact Artifact to be transformed.
+ * @param artifact Artifact to be transformed.
* @param remoteRepository the repository to deploy to
- * @param localRepository the local repository
+ * @param localRepository the local repository
*/
- void transformForDeployment( Artifact artifact, ArtifactRepository remoteRepository,
+ void transformForDeployment( Artifact artifact,
+ ArtifactRepository remoteRepository,
ArtifactRepository localRepository )
throws ArtifactDeploymentException;
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java Mon Nov 5 19:53:41 2007
@@ -28,9 +28,7 @@
import java.util.List;
-/**
- * Manages multiple ArtifactTransformation instances and applies them in succession.
- */
+/** Manages multiple ArtifactTransformation instances and applies them in succession. */
public interface ArtifactTransformationManager
{
String ROLE = ArtifactTransformationManager.class.getName();
@@ -39,32 +37,36 @@
* Take in a artifact and return the transformed artifact for locating in the remote repository. If no
* transformation has occured the original artifact is returned.
*
- * @param artifact Artifact to be transformed.
+ * @param artifact Artifact to be transformed.
* @param remoteRepositories the repositories to check
- * @param localRepository the local repository
+ * @param localRepository the local repository
*/
- void transformForResolve( Artifact artifact, List remoteRepositories, ArtifactRepository localRepository )
+ void transformForResolve( Artifact artifact,
+ List remoteRepositories,
+ ArtifactRepository localRepository )
throws ArtifactResolutionException, ArtifactNotFoundException;
/**
* Take in a artifact and return the transformed artifact for locating in the local repository. If no
* transformation has occured the original artifact is returned.
*
- * @param artifact Artifact to be transformed.
+ * @param artifact Artifact to be transformed.
* @param localRepository the local repository it will be stored in
*/
- void transformForInstall( Artifact artifact, ArtifactRepository localRepository )
+ void transformForInstall( Artifact artifact,
+ ArtifactRepository localRepository )
throws ArtifactInstallationException;
/**
* Take in a artifact and return the transformed artifact for distributing toa remote repository. If no
* transformation has occured the original artifact is returned.
*
- * @param artifact Artifact to be transformed.
+ * @param artifact Artifact to be transformed.
* @param remoteRepository the repository to deploy to
- * @param localRepository the local repository the metadata is stored in
+ * @param localRepository the local repository the metadata is stored in
*/
- void transformForDeployment( Artifact artifact, ArtifactRepository remoteRepository,
+ void transformForDeployment( Artifact artifact,
+ ArtifactRepository remoteRepository,
ArtifactRepository localRepository )
throws ArtifactDeploymentException;
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java Mon Nov 5 19:53:41 2007
@@ -33,36 +33,42 @@
import java.util.List;
public class DefaultArtifactTransformationManager
- implements ArtifactTransformationManager, Initializable
+ implements ArtifactTransformationManager,
+ Initializable
{
private List artifactTransformations;
- public void initialize() throws InitializationException {
- // TODO this is a hack until plexus can fix the ordering of the arrays
- List transforms = new ArrayList();
- Object snapshotTransform = null;
-
- Object obj[] = artifactTransformations.toArray();
- for (int x = 0; x < obj.length; x++)
- {
- if (obj[x].getClass().getName().indexOf("Snapshot") != -1) {
- snapshotTransform = obj[x];
- }
- else
- {
- transforms.add( obj[x] );
- }
- }
-
- if ( snapshotTransform != null )
- {
- transforms.add( snapshotTransform );
- }
+ public void initialize()
+ throws InitializationException
+ {
+ // TODO this is a hack until plexus can fix the ordering of the arrays
+ List transforms = new ArrayList();
+ Object snapshotTransform = null;
- artifactTransformations = transforms;
- }
+ Object obj[] = artifactTransformations.toArray();
+ for ( int x = 0; x < obj.length; x++ )
+ {
+ if ( obj[x].getClass().getName().indexOf( "Snapshot" ) != -1 )
+ {
+ snapshotTransform = obj[x];
+ }
+ else
+ {
+ transforms.add( obj[x] );
+ }
+ }
- public void transformForResolve( Artifact artifact, List remoteRepositories, ArtifactRepository localRepository )
+ if ( snapshotTransform != null )
+ {
+ transforms.add( snapshotTransform );
+ }
+
+ artifactTransformations = transforms;
+ }
+
+ public void transformForResolve( Artifact artifact,
+ List remoteRepositories,
+ ArtifactRepository localRepository )
throws ArtifactResolutionException, ArtifactNotFoundException
{
for ( Iterator i = artifactTransformations.iterator(); i.hasNext(); )
@@ -72,7 +78,8 @@
}
}
- public void transformForInstall( Artifact artifact, ArtifactRepository localRepository )
+ public void transformForInstall( Artifact artifact,
+ ArtifactRepository localRepository )
throws ArtifactInstallationException
{
for ( Iterator i = artifactTransformations.iterator(); i.hasNext(); )
@@ -82,7 +89,8 @@
}
}
- public void transformForDeployment( Artifact artifact, ArtifactRepository remoteRepository,
+ public void transformForDeployment( Artifact artifact,
+ ArtifactRepository remoteRepository,
ArtifactRepository localRepository )
throws ArtifactDeploymentException
{
@@ -92,7 +100,6 @@
transform.transformForDeployment( artifact, remoteRepository, localRepository );
}
}
-
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java Mon Nov 5 19:53:41 2007
@@ -31,7 +31,9 @@
public class LatestArtifactTransformation
extends AbstractVersionTransformation
{
- public void transformForResolve( Artifact artifact, List remoteRepositories, ArtifactRepository localRepository )
+ public void transformForResolve( Artifact artifact,
+ List remoteRepositories,
+ ArtifactRepository localRepository )
throws ArtifactResolutionException, ArtifactNotFoundException
{
if ( Artifact.LATEST_VERSION.equals( artifact.getVersion() ) )
@@ -54,18 +56,21 @@
}
}
- public void transformForInstall( Artifact artifact, ArtifactRepository localRepository )
+ public void transformForInstall( Artifact artifact,
+ ArtifactRepository localRepository )
{
// metadata is added via addPluginArtifactMetadata
}
- public void transformForDeployment( Artifact artifact, ArtifactRepository remoteRepository,
+ public void transformForDeployment( Artifact artifact,
+ ArtifactRepository remoteRepository,
ArtifactRepository localRepository )
{
// metadata is added via addPluginArtifactMetadata
}
- protected String constructVersion( Versioning versioning, String baseVersion )
+ protected String constructVersion( Versioning versioning,
+ String baseVersion )
{
return versioning.getLatest();
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java Mon Nov 5 19:53:41 2007
@@ -39,7 +39,9 @@
public class ReleaseArtifactTransformation
extends AbstractVersionTransformation
{
- public void transformForResolve( Artifact artifact, List remoteRepositories, ArtifactRepository localRepository )
+ public void transformForResolve( Artifact artifact,
+ List remoteRepositories,
+ ArtifactRepository localRepository )
throws ArtifactResolutionException, ArtifactNotFoundException
{
if ( Artifact.RELEASE_VERSION.equals( artifact.getVersion() ) )
@@ -63,14 +65,16 @@
}
}
- public void transformForInstall( Artifact artifact, ArtifactRepository localRepository )
+ public void transformForInstall( Artifact artifact,
+ ArtifactRepository localRepository )
{
ArtifactMetadata metadata = createMetadata( artifact );
artifact.addMetadata( metadata );
}
- public void transformForDeployment( Artifact artifact, ArtifactRepository remoteRepository,
+ public void transformForDeployment( Artifact artifact,
+ ArtifactRepository remoteRepository,
ArtifactRepository localRepository )
{
ArtifactMetadata metadata = createMetadata( artifact );
@@ -92,7 +96,8 @@
return new ArtifactRepositoryMetadata( artifact, versioning );
}
- protected String constructVersion( Versioning versioning, String baseVersion )
+ protected String constructVersion( Versioning versioning,
+ String baseVersion )
{
return versioning.getRelease();
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java Mon Nov 5 19:53:41 2007
@@ -52,9 +52,10 @@
private static final String UTC_TIMESTAMP_PATTERN = "yyyyMMdd.HHmmss";
-
- public void transformForResolve( Artifact artifact, List remoteRepositories, ArtifactRepository localRepository )
+ public void transformForResolve( Artifact artifact,
+ List remoteRepositories,
+ ArtifactRepository localRepository )
throws ArtifactResolutionException
{
// Only select snapshots that are unresolved (eg 1.0-SNAPSHOT, not 1.0-20050607.123456)
@@ -72,7 +73,8 @@
}
}
- public void transformForInstall( Artifact artifact, ArtifactRepository localRepository )
+ public void transformForInstall( Artifact artifact,
+ ArtifactRepository localRepository )
{
if ( artifact.isSnapshot() )
{
@@ -84,7 +86,8 @@
}
}
- public void transformForDeployment( Artifact artifact, ArtifactRepository remoteRepository,
+ public void transformForDeployment( Artifact artifact,
+ ArtifactRepository remoteRepository,
ArtifactRepository localRepository )
throws ArtifactDeploymentException
{
@@ -127,7 +130,8 @@
return deploymentTimestamp;
}
- protected String constructVersion( Versioning versioning, String baseVersion )
+ protected String constructVersion( Versioning versioning,
+ String baseVersion )
{
String version = null;
Snapshot snapshot = versioning.getSnapshot();
@@ -146,7 +150,8 @@
return version;
}
- private int resolveLatestSnapshotBuildNumber( Artifact artifact, ArtifactRepository localRepository,
+ private int resolveLatestSnapshotBuildNumber( Artifact artifact,
+ ArtifactRepository localRepository,
ArtifactRepository remoteRepository )
throws RepositoryMetadataResolutionException
{
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java Mon Nov 5 19:53:41 2007
@@ -100,7 +100,8 @@
return result;
}
- private int compareIntegers( Integer i1, Integer i2 )
+ private int compareIntegers( Integer i1,
+ Integer i2 )
{
// treat null as 0 in comparison
if ( i1 == null ? i2 == null : i1.equals( i2 ) )
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java Mon Nov 5 19:53:41 2007
@@ -23,28 +23,29 @@
import java.util.Map;
import java.util.Iterator;
-public class ManagedVersionMap extends HashMap
+public class ManagedVersionMap
+ extends HashMap
{
- public ManagedVersionMap(Map map)
+ public ManagedVersionMap( Map map )
{
super();
- if (map != null)
+ if ( map != null )
{
- putAll(map);
+ putAll( map );
}
}
public String toString()
{
- StringBuffer buffer = new StringBuffer("ManagedVersionMap (" + size() + " entries)\n");
+ StringBuffer buffer = new StringBuffer( "ManagedVersionMap (" + size() + " entries)\n" );
Iterator iter = keySet().iterator();
- while (iter.hasNext())
+ while ( iter.hasNext() )
{
- String key = (String)iter.next();
- buffer.append(key).append("=").append(get(key));
- if (iter.hasNext())
+ String key = (String) iter.next();
+ buffer.append( key ).append( "=" ).append( get( key ) );
+ if ( iter.hasNext() )
{
- buffer.append("\n");
+ buffer.append( "\n" );
}
}
return buffer.toString();
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java Mon Nov 5 19:53:41 2007
@@ -33,12 +33,15 @@
public class OverConstrainedVersionException
extends ArtifactResolutionException
{
- public OverConstrainedVersionException( String msg, Artifact artifact )
+ public OverConstrainedVersionException( String msg,
+ Artifact artifact )
{
super( msg, artifact );
}
- public OverConstrainedVersionException( String msg, Artifact artifact, List remoteRepositories )
+ public OverConstrainedVersionException( String msg,
+ Artifact artifact,
+ List remoteRepositories )
{
super( msg, artifact, remoteRepositories );
}
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/Restriction.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/Restriction.java?rev=592256&r1=592255&r2=592256&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/Restriction.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/Restriction.java Mon Nov 5 19:53:41 2007
@@ -37,7 +37,9 @@
static final Restriction EVERYTHING = new Restriction( null, false, null, false );
- public Restriction( ArtifactVersion lowerBound, boolean lowerBoundInclusive, ArtifactVersion upperBound,
+ public Restriction( ArtifactVersion lowerBound,
+ boolean lowerBoundInclusive,
+ ArtifactVersion upperBound,
boolean upperBoundInclusive )
{
this.lowerBound = lowerBound;