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/11/06 03:59:11 UTC
svn commit: r711758 - in /maven/mercury/trunk:
mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/
mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/
mercury-repo/mercury-repo-remote-m2/src/main/java/org/apac...
Author: ogusakov
Date: Wed Nov 5 18:59:10 2008
New Revision: 711758
URL: http://svn.apache.org/viewvc?rev=711758&view=rev
Log:
fixed isReadable() bug
Added:
maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RepositoryUtilM2.java
Modified:
maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java
maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryManager.java
maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/Messages.properties
maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryM2.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
Modified: maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java?rev=711758&r1=711757&r2=711758&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java (original)
+++ maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java Wed Nov 5 18:59:10 2008
@@ -187,6 +187,7 @@
assertTrue( assertHasArtifact( res, "asm:asm-util:3.0" ) );
assertTrue( assertHasArtifact( res, "asm:asm-tree:3.0" ) );
assertTrue( assertHasArtifact( res, "asm:asm:3.0" ) );
+
}
//-------------------------------------------------------------------------------------
@SuppressWarnings("unchecked")
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryManager.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryManager.java?rev=711758&r1=711757&r2=711758&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryManager.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryManager.java Wed Nov 5 18:59:10 2008
@@ -31,7 +31,7 @@
{
for( Repository r : _repoList )
{
- if( r.isLocal() && !r.isReadable() && r.isAcceptedQuality( aq ) )
+ if( r.isLocal() && r.isWriteable() && r.isAcceptedQuality( aq ) )
return (LocalRepository)r;
}
return null;
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/Messages.properties
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/Messages.properties?rev=711758&r1=711757&r2=711758&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/Messages.properties (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/Messages.properties Wed Nov 5 18:59:10 2008
@@ -24,4 +24,9 @@
bad.artifact.file=artifact {0} file {1} does not exist
cached.data.problem=problem {0} reading cached data for {1}. Moving on ..
-cached.metadata.reading.exception=problem {0} reading cached data for {1}, server {2}
\ No newline at end of file
+cached.metadata.reading.exception=problem {0} reading cached data for {1}, server {2}
+
+lrepo.no.dir=local repo has a null dir
+lrepo.dir.not.exists=local repo dir {0} does not exist
+lrepo.null=local reposupplied is null
+dest.is.file=Destanation {0} is a file. Cannot copy to it
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryM2.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/RemoteRepositoryM2.java?rev=711758&r1=711757&r2=711758&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryM2.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryM2.java Wed Nov 5 18:59:10 2008
@@ -1,5 +1,7 @@
package org.apache.maven.mercury.repository.remote.m2;
+import java.io.File;
+
import org.apache.maven.mercury.MavenDependencyProcessor;
import org.apache.maven.mercury.repository.api.AbstractRepository;
import org.apache.maven.mercury.repository.api.NonExistentProtocolException;
@@ -9,6 +11,7 @@
import org.apache.maven.mercury.repository.api.RepositoryUpdateIntervalPolicy;
import org.apache.maven.mercury.repository.api.RepositoryUpdatePolicy;
import org.apache.maven.mercury.repository.api.RepositoryWriter;
+import org.apache.maven.mercury.repository.local.m2.LocalRepositoryM2;
import org.apache.maven.mercury.transport.api.Server;
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=711758&r1=711757&r2=711758&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 Wed Nov 5 18:59:10 2008
@@ -331,7 +331,7 @@
private File findLocalRoot( Quality vq )
{
for( LocalRepository lr : _localRepos )
- if( !lr.isReadable() && lr.getVersionRangeQualityRange().isAcceptedQuality( vq ) )
+ if( lr.isWriteable() && lr.getVersionRangeQualityRange().isAcceptedQuality( vq ) )
return lr.getDirectory();
return _defaultRoot;
Added: maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RepositoryUtilM2.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/RepositoryUtilM2.java?rev=711758&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RepositoryUtilM2.java (added)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RepositoryUtilM2.java Wed Nov 5 18:59:10 2008
@@ -0,0 +1,98 @@
+package org.apache.maven.mercury.repository.remote.m2;
+
+import java.io.File;
+import java.util.NoSuchElementException;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+import org.apache.maven.mercury.artifact.ArtifactCoordinates;
+import org.apache.maven.mercury.logging.IMercuryLogger;
+import org.apache.maven.mercury.logging.MercuryLoggerManager;
+import org.apache.maven.mercury.repository.local.m2.LocalRepositoryM2;
+import org.apache.maven.mercury.repository.metadata.Metadata;
+import org.apache.maven.mercury.repository.metadata.MetadataBuilder;
+import org.codehaus.plexus.lang.DefaultLanguage;
+import org.codehaus.plexus.lang.Language;
+
+/**
+ *
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ *
+ */
+public class RepositoryUtilM2
+{
+ private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( RepositoryUtilM2.class );
+ private static final Language _lang = new DefaultLanguage( RepositoryUtilM2.class );
+ //----------------------------------------------------------------------------------
+ public static void flip( LocalRepositoryM2 repo, File dest )
+ {
+ if( repo == null )
+ throw new IllegalArgumentException( _lang.getMessage( "lrepo.null" ) );
+
+ File lDir = repo.getDirectory();
+
+ if( lDir == null )
+ throw new IllegalArgumentException( _lang.getMessage( "lrepo.no.dir" ) );
+
+ if( !lDir.exists() || !lDir.isDirectory() )
+ throw new IllegalArgumentException( _lang.getMessage( "lrepo.dir.not.exists", lDir.toString() ) );
+
+ if( dest.exists() && !dest.isFile() )
+ throw new IllegalArgumentException( _lang.getMessage( "dest.is.file", dest.toString() ) );
+
+
+ }
+ //----------------------------------------------------------------------------------
+ //----------------------------------------------------------------------------------
+}
+//=====================================================================================
+class copyGa
+implements Runnable
+{
+ ConcurrentLinkedQueue<ArtifactCoordinates> _q;
+ File _root;
+ File _dest;
+
+ public copyGa( ConcurrentLinkedQueue<ArtifactCoordinates> q, File from, File to )
+ {
+ this._q = q;
+ this._root = from;
+ this._dest = to;
+ }
+
+ // copy GAV to it's final dest
+ public void run()
+ {
+ try
+ {
+ for(;;)
+ {
+ ArtifactCoordinates ga = _q.remove();
+
+// File gaDir = new File( _root );
+// File gaDest = new File( _dest );
+//
+// gaDest.mkdirs();
+//
+// Metadata gaMd = new Metadata();
+// gaMd.setGroupId( groupId )
+//
+// File [] versions = gaDir.listFiles();
+//
+// for( File v : versions )
+// {
+// if( v.isFile() )
+// continue;
+// }
+
+ }
+ }
+ catch( NoSuchElementException 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=711758&r1=711757&r2=711758&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 Wed Nov 5 18:59:10 2008
@@ -147,7 +147,7 @@
_repositoryReaders[ i++ ] = rr;
- if( ! r.isReadable() )
+ if( r.isWriteable() )
{
_localRepository = (LocalRepository)r.getReader().getRepository();
_localRepositoryWriter = _localRepository.getWriter();
@@ -409,7 +409,9 @@
public byte[] readMetadata( ArtifactBasicMetadata bmd )
throws MetadataReaderException
{
-System.err.println("Asking for pom: "+bmd);
+ if( _log.isDebugEnabled() )
+ _log.debug( "Asking for pom: "+bmd);
+
return readRawData( bmd, "", "pom" );
}
//----------------------------------------------------------------------------------------------------------------------------
@@ -421,7 +423,6 @@
if( _log.isDebugEnabled() )
_log.debug( "request for "+bmd+", classifier="+classifier+", type="+type );
-System.err.println( "request for "+bmd+", classifier="+classifier+", type="+type );
if( bmd == null )
throw new IllegalArgumentException("null bmd supplied");
@@ -442,7 +443,6 @@
if( _log.isDebugEnabled() )
_log.debug( "quality calculated as "+vq.getQuality() == null ? "null" :vq.getQuality().name() );
-System.err.println( "quality calculated as "+vq.getQuality() == null ? "null" :vq.getQuality().name() );
if( Quality.SNAPSHOT_QUALITY.equals( vq ) )
{
@@ -456,7 +456,6 @@
{
if( _log.isDebugEnabled() )
_log.debug( "no snapshots found - throw exception" );
-System.err.println( "no snapshots found - throw exception" );
throw new MetadataReaderException( _lang.getMessage( "no.snapshots", bmd.toString(), classifier, type ) );
}
@@ -475,7 +474,6 @@
{
if( _log.isDebugEnabled() )
_log.debug( "no snapshots found - throw exception" );
-System.err.println("no snapshots found - throw exception" );
throw new MetadataReaderException( _lang.getMessage( "no.snapshots", bmd.toString(), classifier, type ) );
}
@@ -493,7 +491,6 @@
{
if( _log.isDebugEnabled() )
_log.debug( "data found in "+rr.getRepository().getServer()+", results shipped back" );
-System.err.println( "data found in "+rr.getRepository().getServer()+", results shipped back" );
return res;
}
@@ -501,7 +498,6 @@
if( _log.isDebugEnabled() )
_log.debug( "no data found, returning null" );
-System.err.println( "no data found, returning null" );
return null;
}