You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by og...@apache.org on 2008/10/24 19:24:29 UTC
svn commit: r707689 - in /maven/mercury/trunk:
mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/
mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/
mercury-artifact/src/test/java/org/apache/maven/mercury/artifact/...
Author: ogusakov
Date: Fri Oct 24 10:24:28 2008
New Revision: 707689
URL: http://svn.apache.org/viewvc?rev=707689&view=rev
Log:
converted VersionRange to pluggable component
Added:
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/VersionRange.java
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/VersionRangeFactory.java
Modified:
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactBasicMetadata.java
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/MavenVersionRange.java
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/Messages.properties
maven/mercury/trunk/mercury-artifact/src/test/java/org/apache/maven/mercury/artifact/DependencyFilterTest.java
maven/mercury/trunk/mercury-external/src/main/java/org/apache/maven/mercury/builder/api/DependencyProcessor.java
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/THelper.java
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java
maven/mercury/trunk/mercury-pom/pom.xml
maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryGAMetadata.java
maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryGAVMetadata.java
maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/CachedGAMetadata.java
maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/CachedGAVMetadata.java
maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/CachedMetadata.java
maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/MetadataCacheFs.java
maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/test/java/org/apache/maven/mercury/repository/cache/fs/CachedGATest.java
maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/test/java/org/apache/maven/mercury/repository/cache/fs/CachedGAVTest.java
maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java
maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/mercury/repository/local/m2/MetadataProcessorMock.java
maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java
maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/main/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReader.java
maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DefaultDeployer.java
maven/mercury/trunk/mercury-util/src/test/java/org/apache/maven/mercury/util/FileUtilTest.java
maven/mercury/trunk/wagon-mercury/src/main/java/org/apache/maven/wagon/mercury/MercuryWagon.java
maven/mercury/trunk/wagon-mercury/src/main/java/org/apache/maven/wagon/mercury/StupidWagonObserverAdapter.java
Modified: maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactBasicMetadata.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactBasicMetadata.java?rev=707689&r1=707688&r2=707689&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactBasicMetadata.java (original)
+++ maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactBasicMetadata.java Fri Oct 24 10:24:28 2008
@@ -5,7 +5,8 @@
import java.util.List;
import org.apache.maven.mercury.artifact.version.VersionException;
-import org.apache.maven.mercury.artifact.version.MavenVersionRange;
+import org.apache.maven.mercury.artifact.version.VersionRange;
+import org.apache.maven.mercury.artifact.version.VersionRangeFactory;
/**
@@ -411,7 +412,7 @@
{
if( !filterMd.hasVersion() )
return false; // no version in the filter - catch by GA
- MavenVersionRange vr = new MavenVersionRange( filterMd.getVersion() );
+ VersionRange vr = VersionRangeFactory.create( filterMd.getVersion() );
if( vr.includes( dep.getVersion() ))
return false; // catch by version query
}
@@ -427,9 +428,6 @@
if( obj == null || !( obj instanceof ArtifactBasicMetadata ) )
return false;
- String me = toString();
- String him = obj.toString();
-
return toString().equals( obj.toString() );
}
Modified: maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/MavenVersionRange.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/MavenVersionRange.java?rev=707689&r1=707688&r2=707689&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/MavenVersionRange.java (original)
+++ maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/MavenVersionRange.java Fri Oct 24 10:24:28 2008
@@ -1,7 +1,6 @@
package org.apache.maven.mercury.artifact.version;
import java.util.Collection;
-import java.util.List;
import org.apache.maven.mercury.artifact.Artifact;
import org.apache.maven.mercury.artifact.Quality;
@@ -23,6 +22,7 @@
* @version $Id$
*/
public class MavenVersionRange
+implements VersionRange
{
private static final DefaultArtifactVersion ZERO_VERSION = new DefaultArtifactVersion("0.0.0");
private static final Language _lang = new DefaultLanguage( MavenVersionRange.class );
@@ -36,14 +36,14 @@
boolean _toInclusive = false;
//--------------------------------------------------------------------------------------------
- public MavenVersionRange( String range, QualityRange qRange )
+ protected MavenVersionRange( final String range, final QualityRange qRange )
throws VersionException
{
this( range );
setToQualityRange( qRange );
}
//--------------------------------------------------------------------------------------------
- public MavenVersionRange( final String rangeIn )
+ protected MavenVersionRange( final String rangeIn )
throws VersionException
{
String range = AttributeQuery.stripExpression( rangeIn );
@@ -58,14 +58,14 @@
else if( range.startsWith("(") )
_fromInclusive = false;
else
- throw new VersionException("invalid range \""+range+"\"");
+ throw new VersionException( _lang.getMessage( "invalid.maven.version.range", range ) );
if( range.endsWith("]") )
_toInclusive = true;
else if( range.endsWith(")") )
_toInclusive = false;
else
- throw new VersionException("invalid range \""+range+"\"");
+ throw new VersionException( _lang.getMessage( "invalid.maven.version.range", range ) );
int ind = range.indexOf(',');
@@ -99,10 +99,10 @@
}
if( _fromVersion == null && _fromInclusive )
- throw new VersionException("invalid range \""+range+"\" - from ° cannot be inclusive");
+ throw new VersionException( _lang.getMessage( "invalid.maven.version.range.bad.from", range ) );
if( _toVersion == null && _toInclusive )
- throw new VersionException("invalid range \""+range+"\" - to ° cannot be inclusive");
+ throw new VersionException( _lang.getMessage( "invalid.maven.version.range.bad.to", range ) );
}
else
@@ -141,10 +141,13 @@
if( c == '-' || c == '_' )
continue;
- throw new VersionException( "invalid character '"+c+"' in version \""+v+"\"" );
+ throw new VersionException( _lang.getMessage( "invalid.character", ""+c, v ) );
}
}
//--------------------------------------------------------------------------------------------
+ /* (non-Javadoc)
+ * @see org.apache.maven.mercury.artifact.version.VersionRange#includes(java.lang.String)
+ */
public boolean includes( String version )
{
DefaultArtifactVersion ver = new DefaultArtifactVersion( version );
Modified: maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/Messages.properties
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/Messages.properties?rev=707689&r1=707688&r2=707689&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/Messages.properties (original)
+++ maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/Messages.properties Fri Oct 24 10:24:28 2008
@@ -1,2 +1,6 @@
bad.version.sn=version range cannot include SNAPSHOT, LATEST or RELEASE versions, found: {0}
-null.version.to.compare=one of the versions is null: {0} vs {1}, cannot compare
\ No newline at end of file
+null.version.to.compare=one of the versions is null: {0} vs {1}, cannot compare
+invalid.maven.version.range=invalid range: {0}
+invalid.maven.version.range.bad.from=invalid range: {0} - from infinity cannot be inclusive
+invalid.maven.version.range.bad.to=invalid range: {0} - to infinity cannot be inclusive
+invalid.character="invalid character '{0}' in version {1}
Added: maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/VersionRange.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/VersionRange.java?rev=707689&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/VersionRange.java (added)
+++ maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/VersionRange.java Fri Oct 24 10:24:28 2008
@@ -0,0 +1,14 @@
+package org.apache.maven.mercury.artifact.version;
+
+/**
+ * interface to the version range processor. To be implemented for various syntaxes/interpreters
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ *
+ */
+public interface VersionRange
+{
+ /** returns true if the supplied version fits into the range */
+ public boolean includes( String version );
+}
Added: maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/VersionRangeFactory.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/VersionRangeFactory.java?rev=707689&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/VersionRangeFactory.java (added)
+++ maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/VersionRangeFactory.java Fri Oct 24 10:24:28 2008
@@ -0,0 +1,27 @@
+package org.apache.maven.mercury.artifact.version;
+
+import org.apache.maven.mercury.artifact.QualityRange;
+
+/**
+ * lack of IoC container makes me throw this class in.
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ *
+ */
+public class VersionRangeFactory
+{
+
+ public static VersionRange create( String version )
+ throws VersionException
+ {
+ return new MavenVersionRange( version );
+ }
+
+ public static VersionRange create( String version, final QualityRange qRange )
+ throws VersionException
+ {
+ return new MavenVersionRange( version, qRange );
+ }
+
+}
Modified: maven/mercury/trunk/mercury-artifact/src/test/java/org/apache/maven/mercury/artifact/DependencyFilterTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/src/test/java/org/apache/maven/mercury/artifact/DependencyFilterTest.java?rev=707689&r1=707688&r2=707689&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-artifact/src/test/java/org/apache/maven/mercury/artifact/DependencyFilterTest.java (original)
+++ maven/mercury/trunk/mercury-artifact/src/test/java/org/apache/maven/mercury/artifact/DependencyFilterTest.java Fri Oct 24 10:24:28 2008
@@ -2,10 +2,10 @@
import java.util.ArrayList;
-import org.apache.maven.mercury.artifact.version.VersionException;
-
import junit.framework.TestCase;
+import org.apache.maven.mercury.artifact.version.VersionException;
+
/**
*
*
Modified: maven/mercury/trunk/mercury-external/src/main/java/org/apache/maven/mercury/builder/api/DependencyProcessor.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-external/src/main/java/org/apache/maven/mercury/builder/api/DependencyProcessor.java?rev=707689&r1=707688&r2=707689&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-external/src/main/java/org/apache/maven/mercury/builder/api/DependencyProcessor.java (original)
+++ maven/mercury/trunk/mercury-external/src/main/java/org/apache/maven/mercury/builder/api/DependencyProcessor.java Fri Oct 24 10:24:28 2008
@@ -1,6 +1,5 @@
package org.apache.maven.mercury.builder.api;
-import java.util.Hashtable;
import java.util.List;
import java.util.Map;
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java?rev=707689&r1=707688&r2=707689&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java Fri Oct 24 10:24:28 2008
@@ -3,15 +3,12 @@
import java.io.File;
import java.net.URL;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
import java.util.logging.Level;
-import java.util.logging.LogManager;
import java.util.logging.Logger;
import junit.framework.TestCase;
-import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.mercury.MavenDependencyProcessor;
import org.apache.maven.mercury.artifact.Artifact;
import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
@@ -19,15 +16,12 @@
import org.apache.maven.mercury.artifact.ArtifactScopeEnum;
import org.apache.maven.mercury.builder.api.DependencyProcessor;
import org.apache.maven.mercury.metadata.DependencyTreeBuilder;
-import org.apache.maven.mercury.metadata.MetadataTreeCircularDependencyException;
import org.apache.maven.mercury.metadata.MetadataTreeException;
import org.apache.maven.mercury.metadata.MetadataTreeNode;
import org.apache.maven.mercury.repository.api.ArtifactResults;
import org.apache.maven.mercury.repository.api.Repository;
-import org.apache.maven.mercury.repository.api.RepositoryException;
import org.apache.maven.mercury.repository.api.RepositoryReader;
import org.apache.maven.mercury.repository.local.m2.LocalRepositoryM2;
-import org.apache.maven.mercury.repository.local.m2.MetadataProcessorMock;
import org.apache.maven.mercury.repository.remote.m2.RemoteRepositoryM2;
import org.apache.maven.mercury.repository.virtual.VirtualRepositoryReader;
import org.apache.maven.mercury.transport.api.Server;
@@ -43,8 +37,8 @@
{
private static final org.slf4j.Logger _log = org.slf4j.LoggerFactory.getLogger( DependencyTreeBuilderTest.class );
-// String repoUrl = "http://repository.sonatype.org/content/groups/public";
- String repoUrl = "http://nexus:8081/nexus/content/groups/public";
+ String repoUrl = "http://repository.sonatype.org/content/groups/public";
+// String repoUrl = "http://nexus:8081/nexus/content/groups/public";
File repoDir;
@@ -103,7 +97,7 @@
}
//----------------------------------------------------------------------------------------------
- public void ntestResolveConflicts()
+ public void testResolveConflicts()
throws Exception
{
// String artifactId = "org.testng:testng:5.7";
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/THelper.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/THelper.java?rev=707689&r1=707688&r2=707689&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/THelper.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/THelper.java Fri Oct 24 10:24:28 2008
@@ -1,7 +1,6 @@
package org.apache.maven.mercury.repository.tests;
import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
Modified: maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java?rev=707689&r1=707688&r2=707689&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java (original)
+++ maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java Fri Oct 24 10:24:28 2008
@@ -5,7 +5,6 @@
import java.util.Comparator;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
import org.apache.maven.mercury.artifact.ArtifactMetadata;
Modified: maven/mercury/trunk/mercury-pom/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-pom/pom.xml?rev=707689&r1=707688&r2=707689&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-pom/pom.xml (original)
+++ maven/mercury/trunk/mercury-pom/pom.xml Fri Oct 24 10:24:28 2008
@@ -10,7 +10,7 @@
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-pom</artifactId>
<packaging>pom</packaging>
- <name>Mercury parent POM: ${project.version}</name>
+ <name>Mercury parent POM: ${project.version}</name>
<issueManagement>
<system>jira</system>
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryGAMetadata.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryGAMetadata.java?rev=707689&r1=707688&r2=707689&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryGAMetadata.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryGAMetadata.java Fri Oct 24 10:24:28 2008
@@ -8,7 +8,6 @@
import org.apache.maven.mercury.artifact.ArtifactCoordinates;
import org.apache.maven.mercury.artifact.version.VersionComparator;
import org.apache.maven.mercury.repository.metadata.Metadata;
-import org.apache.maven.mercury.repository.metadata.MetadataBuilder;
import org.apache.maven.mercury.repository.metadata.MetadataException;
import org.apache.maven.mercury.util.TimeUtil;
import org.apache.maven.mercury.util.Util;
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryGAVMetadata.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryGAVMetadata.java?rev=707689&r1=707688&r2=707689&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryGAVMetadata.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryGAVMetadata.java Fri Oct 24 10:24:28 2008
@@ -7,7 +7,6 @@
import org.apache.maven.mercury.artifact.ArtifactCoordinates;
import org.apache.maven.mercury.artifact.version.VersionComparator;
import org.apache.maven.mercury.repository.metadata.Metadata;
-import org.apache.maven.mercury.repository.metadata.MetadataBuilder;
import org.apache.maven.mercury.repository.metadata.MetadataException;
import org.apache.maven.mercury.util.TimeUtil;
import org.apache.maven.mercury.util.Util;
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/CachedGAMetadata.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/CachedGAMetadata.java?rev=707689&r1=707688&r2=707689&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/CachedGAMetadata.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/CachedGAMetadata.java Fri Oct 24 10:24:28 2008
@@ -8,7 +8,6 @@
import org.apache.maven.mercury.artifact.ArtifactCoordinates;
import org.apache.maven.mercury.repository.api.MetadataCorruptionException;
import org.apache.maven.mercury.repository.api.RepositoryGAMetadata;
-import org.apache.maven.mercury.repository.metadata.Metadata;
import org.apache.maven.mercury.repository.metadata.MetadataException;
import org.apache.maven.mercury.util.Util;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/CachedGAVMetadata.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/CachedGAVMetadata.java?rev=707689&r1=707688&r2=707689&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/CachedGAVMetadata.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/CachedGAVMetadata.java Fri Oct 24 10:24:28 2008
@@ -7,9 +7,7 @@
import org.apache.maven.mercury.artifact.ArtifactCoordinates;
import org.apache.maven.mercury.repository.api.MetadataCorruptionException;
-import org.apache.maven.mercury.repository.api.RepositoryGAMetadata;
import org.apache.maven.mercury.repository.api.RepositoryGAVMetadata;
-import org.apache.maven.mercury.repository.metadata.Metadata;
import org.apache.maven.mercury.repository.metadata.MetadataException;
import org.apache.maven.mercury.util.Util;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/CachedMetadata.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/CachedMetadata.java?rev=707689&r1=707688&r2=707689&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/CachedMetadata.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/CachedMetadata.java Fri Oct 24 10:24:28 2008
@@ -10,7 +10,6 @@
import java.util.List;
import org.apache.maven.mercury.repository.api.MetadataCorruptionException;
-import org.apache.maven.mercury.repository.api.RepositoryGAVMetadata;
import org.apache.maven.mercury.repository.cache.md.Attribute;
import org.apache.maven.mercury.repository.cache.md.CachedRawMetadata;
import org.apache.maven.mercury.repository.cache.md.Element;
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/MetadataCacheFs.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/MetadataCacheFs.java?rev=707689&r1=707688&r2=707689&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/MetadataCacheFs.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/MetadataCacheFs.java Fri Oct 24 10:24:28 2008
@@ -19,7 +19,6 @@
import org.apache.maven.mercury.repository.api.RepositoryUpdatePolicy;
import org.apache.maven.mercury.util.FileLockBundle;
import org.apache.maven.mercury.util.FileUtil;
-import org.apache.maven.mercury.util.TimeUtil;
import org.codehaus.plexus.lang.DefaultLanguage;
import org.codehaus.plexus.lang.Language;
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/test/java/org/apache/maven/mercury/repository/cache/fs/CachedGATest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/test/java/org/apache/maven/mercury/repository/cache/fs/CachedGATest.java?rev=707689&r1=707688&r2=707689&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/test/java/org/apache/maven/mercury/repository/cache/fs/CachedGATest.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/test/java/org/apache/maven/mercury/repository/cache/fs/CachedGATest.java Fri Oct 24 10:24:28 2008
@@ -1,19 +1,15 @@
package org.apache.maven.mercury.repository.cache.fs;
import java.io.File;
-import java.io.IOException;
import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.maven.mercury.artifact.ArtifactCoordinates;
+import junit.framework.TestCase;
+
import org.apache.maven.mercury.repository.api.RepositoryGAMetadata;
import org.apache.maven.mercury.repository.metadata.Metadata;
import org.apache.maven.mercury.repository.metadata.MetadataBuilder;
import org.apache.maven.mercury.util.FileUtil;
-import junit.framework.TestCase;
-
/**
*
*
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/test/java/org/apache/maven/mercury/repository/cache/fs/CachedGAVTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/test/java/org/apache/maven/mercury/repository/cache/fs/CachedGAVTest.java?rev=707689&r1=707688&r2=707689&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/test/java/org/apache/maven/mercury/repository/cache/fs/CachedGAVTest.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/test/java/org/apache/maven/mercury/repository/cache/fs/CachedGAVTest.java Fri Oct 24 10:24:28 2008
@@ -1,20 +1,15 @@
package org.apache.maven.mercury.repository.cache.fs;
import java.io.File;
-import java.io.IOException;
import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.maven.mercury.artifact.ArtifactCoordinates;
-import org.apache.maven.mercury.repository.api.RepositoryGAMetadata;
+import junit.framework.TestCase;
+
import org.apache.maven.mercury.repository.api.RepositoryGAVMetadata;
import org.apache.maven.mercury.repository.metadata.Metadata;
import org.apache.maven.mercury.repository.metadata.MetadataBuilder;
import org.apache.maven.mercury.util.FileUtil;
-import junit.framework.TestCase;
-
/**
*
*
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java?rev=707689&r1=707688&r2=707689&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java Fri Oct 24 10:24:28 2008
@@ -6,7 +6,6 @@
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import org.apache.maven.mercury.artifact.Artifact;
@@ -15,7 +14,8 @@
import org.apache.maven.mercury.artifact.Quality;
import org.apache.maven.mercury.artifact.version.DefaultArtifactVersion;
import org.apache.maven.mercury.artifact.version.VersionException;
-import org.apache.maven.mercury.artifact.version.MavenVersionRange;
+import org.apache.maven.mercury.artifact.version.VersionRange;
+import org.apache.maven.mercury.artifact.version.VersionRangeFactory;
import org.apache.maven.mercury.builder.api.DependencyProcessor;
import org.apache.maven.mercury.builder.api.MetadataReader;
import org.apache.maven.mercury.builder.api.MetadataReaderException;
@@ -436,10 +436,10 @@
File [] versionFiles = gaDir.listFiles();
- MavenVersionRange versionQuery;
+ VersionRange versionQuery;
try
{
- versionQuery = new MavenVersionRange( bmd.getVersion(), _repo.getVersionRangeQualityRange() );
+ versionQuery = VersionRangeFactory.create( bmd.getVersion(), _repo.getVersionRangeQualityRange() );
}
catch( VersionException e )
{
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/mercury/repository/local/m2/MetadataProcessorMock.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/mercury/repository/local/m2/MetadataProcessorMock.java?rev=707689&r1=707688&r2=707689&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/mercury/repository/local/m2/MetadataProcessorMock.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/mercury/repository/local/m2/MetadataProcessorMock.java Fri Oct 24 10:24:28 2008
@@ -3,7 +3,6 @@
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Hashtable;
import java.util.List;
import java.util.Map;
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java?rev=707689&r1=707688&r2=707689&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java Fri Oct 24 10:24:28 2008
@@ -17,8 +17,10 @@
import org.apache.maven.mercury.artifact.DefaultArtifact;
import org.apache.maven.mercury.artifact.Quality;
import org.apache.maven.mercury.artifact.version.DefaultArtifactVersion;
-import org.apache.maven.mercury.artifact.version.VersionException;
import org.apache.maven.mercury.artifact.version.MavenVersionRange;
+import org.apache.maven.mercury.artifact.version.VersionException;
+import org.apache.maven.mercury.artifact.version.VersionRange;
+import org.apache.maven.mercury.artifact.version.VersionRangeFactory;
import org.apache.maven.mercury.builder.api.DependencyProcessor;
import org.apache.maven.mercury.builder.api.MetadataReader;
import org.apache.maven.mercury.builder.api.MetadataReaderException;
@@ -501,10 +503,10 @@
continue;
}
- MavenVersionRange versionQuery;
+ VersionRange versionQuery;
try
{
- versionQuery = new MavenVersionRange( bmd.getVersion(), _repo.getVersionRangeQualityRange() );
+ versionQuery = VersionRangeFactory.create( bmd.getVersion(), _repo.getVersionRangeQualityRange() );
}
catch( VersionException e )
{
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/main/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReader.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/main/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReader.java?rev=707689&r1=707688&r2=707689&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/main/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReader.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/main/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReader.java Fri Oct 24 10:24:28 2008
@@ -7,7 +7,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.TreeMap;
import java.util.TreeSet;
import org.apache.maven.mercury.artifact.Artifact;
@@ -17,7 +16,6 @@
import org.apache.maven.mercury.artifact.api.ArtifactListProcessor;
import org.apache.maven.mercury.artifact.api.ArtifactListProcessorException;
import org.apache.maven.mercury.artifact.version.MetadataVersionComparator;
-import org.apache.maven.mercury.artifact.version.VersionComparator;
import org.apache.maven.mercury.builder.api.DependencyProcessor;
import org.apache.maven.mercury.builder.api.MetadataReader;
import org.apache.maven.mercury.builder.api.MetadataReaderException;
Modified: maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DefaultDeployer.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DefaultDeployer.java?rev=707689&r1=707688&r2=707689&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DefaultDeployer.java (original)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DefaultDeployer.java Fri Oct 24 10:24:28 2008
@@ -34,7 +34,6 @@
import org.apache.maven.mercury.crypto.api.StreamObserver;
import org.apache.maven.mercury.crypto.api.StreamObserverException;
import org.apache.maven.mercury.crypto.api.StreamObserverFactory;
-import org.apache.maven.mercury.crypto.api.StreamVerifierException;
import org.apache.maven.mercury.crypto.api.StreamVerifierFactory;
import org.apache.maven.mercury.spi.http.client.DestinationRealmResolver;
import org.apache.maven.mercury.spi.http.client.FileExchange;
Modified: maven/mercury/trunk/mercury-util/src/test/java/org/apache/maven/mercury/util/FileUtilTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-util/src/test/java/org/apache/maven/mercury/util/FileUtilTest.java?rev=707689&r1=707688&r2=707689&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-util/src/test/java/org/apache/maven/mercury/util/FileUtilTest.java (original)
+++ maven/mercury/trunk/mercury-util/src/test/java/org/apache/maven/mercury/util/FileUtilTest.java Fri Oct 24 10:24:28 2008
@@ -2,10 +2,6 @@
import java.io.File;
import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.nio.channels.FileChannel;
-import java.nio.channels.FileLock;
-import java.nio.channels.OverlappingFileLockException;
import java.util.HashSet;
import junit.framework.TestCase;
Modified: maven/mercury/trunk/wagon-mercury/src/main/java/org/apache/maven/wagon/mercury/MercuryWagon.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/wagon-mercury/src/main/java/org/apache/maven/wagon/mercury/MercuryWagon.java?rev=707689&r1=707688&r2=707689&view=diff
==============================================================================
--- maven/mercury/trunk/wagon-mercury/src/main/java/org/apache/maven/wagon/mercury/MercuryWagon.java (original)
+++ maven/mercury/trunk/wagon-mercury/src/main/java/org/apache/maven/wagon/mercury/MercuryWagon.java Fri Oct 24 10:24:28 2008
@@ -36,7 +36,6 @@
import org.apache.maven.wagon.authorization.AuthorizationException;
import org.apache.maven.wagon.events.TransferEvent;
import org.apache.maven.wagon.proxy.ProxyInfo;
-import org.apache.maven.wagon.proxy.ProxyUtils;
import org.apache.maven.wagon.resource.Resource;
import org.codehaus.plexus.lang.DefaultLanguage;
import org.codehaus.plexus.lang.Language;
Modified: maven/mercury/trunk/wagon-mercury/src/main/java/org/apache/maven/wagon/mercury/StupidWagonObserverAdapter.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/wagon-mercury/src/main/java/org/apache/maven/wagon/mercury/StupidWagonObserverAdapter.java?rev=707689&r1=707688&r2=707689&view=diff
==============================================================================
--- maven/mercury/trunk/wagon-mercury/src/main/java/org/apache/maven/wagon/mercury/StupidWagonObserverAdapter.java (original)
+++ maven/mercury/trunk/wagon-mercury/src/main/java/org/apache/maven/wagon/mercury/StupidWagonObserverAdapter.java Fri Oct 24 10:24:28 2008
@@ -2,9 +2,6 @@
import org.apache.maven.mercury.crypto.api.StreamObserver;
import org.apache.maven.mercury.crypto.api.StreamObserverException;
-import org.apache.maven.mercury.crypto.api.StreamVerifierAttributes;
-import org.apache.maven.mercury.crypto.api.StreamVerifierException;
-import org.apache.maven.mercury.crypto.sha.SHA1Verifier;
import org.apache.maven.wagon.events.TransferEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Re: svn commit: r707689 - in /maven/mercury/trunk: mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/
mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/
mercury-artifact/src/test/java/org/apache/maven/mercury/artifact/...
Posted by Benjamin Bentmann <be...@udo.edu>.
Hi Oleg,
> Author: ogusakov
> Date: Fri Oct 24 10:24:28 2008
> New Revision: 707689
>
> URL: http://svn.apache.org/viewvc?rev=707689&view=rev
> Log:
> converted VersionRange to pluggable component
>
> Added:
> maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/VersionRange.java
> maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/VersionRangeFactory.java
>
> Added: maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/VersionRange.java
> URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/VersionRange.java?rev=707689&view=auto
> ==============================================================================
> --- maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/VersionRange.java (added)
> +++ maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/VersionRange.java Fri Oct 24 10:24:28 2008
> @@ -0,0 +1,14 @@
> +package org.apache.maven.mercury.artifact.version;
> +
> +/**
> + * interface to the version range processor. To be implemented for various syntaxes/interpreters
> + *
> + * @author Oleg Gusakov
> + * @version $Id$
> + *
> + */
> +public interface VersionRange
> +{
> + /** returns true if the supplied version fits into the range */
> + public boolean includes( String version );
> +}
>
> Added: maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/VersionRangeFactory.java
> URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/VersionRangeFactory.java?rev=707689&view=auto
> ==============================================================================
> --- maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/VersionRangeFactory.java (added)
> +++ maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/VersionRangeFactory.java Fri Oct 24 10:24:28 2008
> @@ -0,0 +1,27 @@
> +package org.apache.maven.mercury.artifact.version;
> +
> +import org.apache.maven.mercury.artifact.QualityRange;
> +
> +/**
> + * lack of IoC container makes me throw this class in.
> + *
> + * @author Oleg Gusakov
> + * @version $Id$
> + *
> + */
> +public class VersionRangeFactory
> +{
> +
> + public static VersionRange create( String version )
> + throws VersionException
> + {
> + return new MavenVersionRange( version );
> + }
> +
> + public static VersionRange create( String version, final QualityRange qRange )
> + throws VersionException
> + {
> + return new MavenVersionRange( version, qRange );
> + }
> +
> +}
>
Please remember to add SVN properties to the source files. The easiest
way to do so is setting up your SVN client with enable-auto-props as
sketched in the article "Committer Environment" [0].
Benjamin
[0] http://maven.apache.org/developers/committer-environment.html
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org