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/08/20 06:46:41 UTC

svn commit: r687239 - in /maven/sandbox/trunk/mercury: ./ 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/mercur...

Author: ogusakov
Date: Tue Aug 19 21:46:40 2008
New Revision: 687239

URL: http://svn.apache.org/viewvc?rev=687239&view=rev
Log:
local repo - reader and writer work, group md is fine, version md - still investigating

Added:
    maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Server.java   (contents, props changed)
      - copied, changed from r686026, maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Server.java
    maven/sandbox/trunk/mercury/mercury-util/   (with props)
    maven/sandbox/trunk/mercury/mercury-util/pom.xml
Removed:
    maven/sandbox/trunk/mercury/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/repository/MetadataProcessorMock.java
Modified:
    maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/Artifact.java
    maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactBasicMetadata.java
    maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/DefaultArtifact.java
    maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/VersionRange.java
    maven/sandbox/trunk/mercury/mercury-artifact/src/test/java/org/apache/maven/mercury/artifact/version/VersionRangeTest.java
    maven/sandbox/trunk/mercury/mercury-md/mercury-md-sat/pom.xml
    maven/sandbox/trunk/mercury/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java
    maven/sandbox/trunk/mercury/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/repository/metadata/MetadataReaderTest.java
    maven/sandbox/trunk/mercury/mercury-md/mercury-md-shared/pom.xml
    maven/sandbox/trunk/mercury/mercury-md/mercury-md-shared/src/main/java/org/apache/maven/mercury/repository/metadata/MetadataBuilder.java
    maven/sandbox/trunk/mercury/mercury-md/mercury-md-shared/src/test/java/org/apache/maven/mercury/repository/metadata/MetadataBuilderTest.java
    maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/AbstractRepository.java
    maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/Repository.java
    maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/pom.xml
    maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryM2.java
    maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java
    maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryWriterM2.java
    maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/Messages.properties
    maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2Test.java
    maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-file/pom.xml
    maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DefaultDeployer.java
    maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/DefaultRetriever.java
    maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/client/JettyDeployerTest.java
    maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/client/JettyRetrieverTest.java
    maven/sandbox/trunk/mercury/mercury-transport/pom.xml
    maven/sandbox/trunk/mercury/pom.xml

Modified: maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/Artifact.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/Artifact.java?rev=687239&r1=687238&r2=687239&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/Artifact.java (original)
+++ maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/Artifact.java Tue Aug 19 21:46:40 2008
@@ -16,6 +16,7 @@
  */
 
 import java.io.File;
+import java.io.InputStream;
 import java.util.regex.Pattern;
 
 
@@ -75,8 +76,16 @@
     boolean hasClassifier();
 
     File getFile();
+    
+    InputStream getStream();
 
     void setFile( File destination );
+    
+    byte [] getPomBlob();
+    
+    String getBaseName();
+    
+    String getBaseName( String classifier );
 
     // ----------------------------------------------------------------------
 

Modified: maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactBasicMetadata.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactBasicMetadata.java?rev=687239&r1=687238&r2=687239&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactBasicMetadata.java (original)
+++ maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactBasicMetadata.java Tue Aug 19 21:46:40 2008
@@ -272,7 +272,7 @@
   
   public boolean hasClassifier()
   {
-    return classifier == null;
+    return classifier != null && classifier.length() > 0;
   }
 
   public Boolean isLocal()

Modified: maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/DefaultArtifact.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/DefaultArtifact.java?rev=687239&r1=687238&r2=687239&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/DefaultArtifact.java (original)
+++ maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/DefaultArtifact.java Tue Aug 19 21:46:40 2008
@@ -16,6 +16,7 @@
  */
 
 import java.io.File;
+import java.io.InputStream;
 
 /**
  * @author Jason van Zyl
@@ -26,301 +27,323 @@
 extends ArtifactMetadata
 implements Artifact
 {
-    private File file;
+  private File file;
 
-    private String classifier;
+  private InputStream stream;
 
-    private String downloadUrl;
+  private String downloadUrl;
 
-    private String inheritedScope;
-    
-    public DefaultArtifact( String groupId, String artifactId, String version, String type, String classifier, boolean optional, String scope, String inheritedScope )
-    {
-        if ( version == null )
-        {
-            throw new IllegalArgumentException( "Version cannot be null." );
-        }
-
-        initialize( groupId, artifactId, version, type, classifier, optional, scope, inheritedScope );
-    }
-    
-    public DefaultArtifact( ArtifactBasicMetadata bmd )
-    {
-        if ( bmd.getVersion() == null )
-        {
-            throw new IllegalArgumentException( "Version cannot be null." );
-        }
-
-        initialize( bmd.getGroupId(), bmd.getArtifactId(), bmd.getVersion(), bmd.getType()
-                  , bmd.getClassifier(), bmd.isOptional(), bmd.getScope(), bmd.getScope() 
-                  );
-    }
-
-    public String getInheritedScope()
-    {
-        return inheritedScope;
-    }
-    
-    private void initialize( String groupId, String artifactId, String version, String type, String classifier, boolean optional, String scope, String inheritedScope )
-    {
-        this.inheritedScope = inheritedScope;
-        this.groupId = groupId;
-        this.artifactId = artifactId;
-        this.version = version;
-        //this.scope = scope;
-        this.type = type;
-        this.classifier = classifier;
-        this.optional = optional;
-
-        String desiredScope = Artifact.SCOPE_RUNTIME;
-
-        boolean calc = true;
-
-        if ( inheritedScope == null )
-        {
-            desiredScope = scope;
-        }
-        else if ( Artifact.SCOPE_TEST.equals( scope ) || Artifact.SCOPE_PROVIDED.equals( scope ) )
-        {
-            desiredScope = scope;
-            //calc = false;
-        }
-        else if ( Artifact.SCOPE_COMPILE.equals( scope ) && Artifact.SCOPE_COMPILE.equals( inheritedScope ) )
-        {
-            // added to retain compile artifactScope. Remove if you want compile inherited as runtime
-            desiredScope = Artifact.SCOPE_COMPILE;
-        }
-
-        if ( calc )
-        {
-            if ( Artifact.SCOPE_TEST.equals( inheritedScope ) )
-            {
-                desiredScope = Artifact.SCOPE_TEST;
-            }
-
-            if ( Artifact.SCOPE_PROVIDED.equals( inheritedScope ) )
-            {
-                desiredScope = Artifact.SCOPE_PROVIDED;
-            }
-
-            if ( Artifact.SCOPE_SYSTEM.equals( scope ) )
-            {
-                // system scopes come through unchanged...
-                desiredScope = Artifact.SCOPE_SYSTEM;
-            }
-        }
-        
-        this.scope = desiredScope;
-
-        validateIdentity();
-    }
-
-    private void validateIdentity()
-    {
-        if ( empty( groupId ) )
-        {
-            throw new IllegalArgumentException( "The groupId cannot be empty." );
-        }
-
-        if ( artifactId == null )
-        {
-            throw new IllegalArgumentException( "The artifactId cannot be empty." );
-        }
-
-        if ( type == null )
-        {
-            throw new IllegalArgumentException( "The type cannot be empty." );
-        }
-
-        if ( ( version == null ) )
-        {
-            throw new IllegalArgumentException( "The version cannot be empty." );
-        }
-    }
-
-    private boolean empty( String value )
-    {
-        return ( value == null ) || ( value.trim().length() < 1 );
-    }
-
-    public void setFile( File file )
-    {
-        this.file = file;
-    }
-
-    public File getFile()
-    {
-        return file;
-    }
-    // ----------------------------------------------------------------------
-    //
-    // ----------------------------------------------------------------------
-
-    public String getId()
-    {
-        return getDependencyConflictId() + ":" + getVersion();
-    }
-
-    public String getDependencyConflictId()
-    {
-        StringBuilder sb = new StringBuilder();
-        sb.append( getGroupId() );
-        sb.append( ":" );
-        appendArtifactTypeClassifierString( sb );
-        return sb.toString();
-    }
-
-    private void appendArtifactTypeClassifierString( StringBuilder sb )
-    {
-        sb.append( getArtifactId() );
-        sb.append( ":" );
-        sb.append( getType() );
-        if ( hasClassifier() )
-        {
-            sb.append( ":" );
-            sb.append( getClassifier() );
-        }
-    }
-
-    // ----------------------------------------------------------------------
-    // Object overrides
-    // ----------------------------------------------------------------------
-    @Override
-    public String toString()
-    {
-        StringBuilder sb = new StringBuilder();
-        if ( getGroupId() != null )
-        {
-            sb.append( getGroupId() );
-            sb.append( ":" );
-        }
-        appendArtifactTypeClassifierString( sb );
-        sb.append( ":" );
-        
-        if ( getVersion() != null )
-        {
-            sb.append( getVersion() );
-        }
-        
-        if ( scope != null )
-        {
-            sb.append( ":" );
-            sb.append( scope );
-        }
-        return sb.toString();
-    }
-
-    @Override
-    public int hashCode()
-    {
-        int result = 17;
-        result = 37 * result + groupId.hashCode();
-        result = 37 * result + artifactId.hashCode();
-        result = 37 * result + type.hashCode();
-        if ( version != null )
-        {
-            result = 37 * result + version.hashCode();
-        }
-        result = 37 * result + ( classifier != null ? classifier.hashCode() : 0 );
-        return result;
-    }
-
-    @Override
-    public boolean equals( Object o )
-    {
-        if ( o == this )
-        {
-            return true;
-        }
-
-        if ( !( o instanceof Artifact ) )
-        {
-            return false;
-        }
-
-        Artifact a = (Artifact) o;
-
-        if ( !a.getGroupId().equals( groupId ) )
-        {
-            return false;
-        }
-        else if ( !a.getArtifactId().equals( artifactId ) )
-        {
-            return false;
-        }
-        else if ( !a.getVersion().equals( version ) )
-        {
-            return false;
-        }
-        else if ( !a.getType().equals( type ) )
-        {
-            return false;
-        }
-        else if ( a.getClassifier() == null ? classifier != null : !a.getClassifier().equals( classifier ) )
-        {
-            return false;
-        }
-
-        // We don't consider the version range in the comparison, just the resolved version
-
-        return true;
-    }
-
-    public int compareTo( Artifact o )
-    {
-        Artifact a = (Artifact) o;
-
-        int result = groupId.compareTo( a.getGroupId() );
-        if ( result == 0 )
-        {
-            result = artifactId.compareTo( a.getArtifactId() );
-            if ( result == 0 )
-            {
-                result = type.compareTo( a.getType() );
-                if ( result == 0 )
-                {
-                    if ( classifier == null )
-                    {
-                        if ( a.getClassifier() != null )
-                        {
-                            result = 1;
-                        }
-                    }
-                    else
-                    {
-                        if ( a.getClassifier() != null )
-                        {
-                            result = classifier.compareTo( a.getClassifier() );
-                        }
-                        else
-                        {
-                            result = -1;
-                        }
-                    }
-                    if ( result == 0 )
-                    {
-                        // We don't consider the version range in the comparison, just the resolved version
-                        result = version.compareTo( a.getVersion() );
-                    }
-                }
-            }
-        }
-        return result;
-    }
-
-    public String getDownloadUrl()
-    {
-        return downloadUrl;
-    }
-
-    public void setDownloadUrl( String downloadUrl )
-    {
-        this.downloadUrl = downloadUrl;
-    }
-
-    public void setResolvedVersion( String version )
-    {
-        this.version = version;
-        // retain baseVersion
-    }
+  private String inheritedScope;
+  
+  private byte [] pomBlob;
+  
+  public DefaultArtifact( String groupId, String artifactId, String version, String type, String classifier, boolean optional, String scope, String inheritedScope )
+  {
+      if ( version == null )
+      {
+          throw new IllegalArgumentException( "Version cannot be null." );
+      }
+
+      initialize( groupId, artifactId, version, type, classifier, optional, scope, inheritedScope );
+  }
+  
+  public DefaultArtifact( ArtifactBasicMetadata bmd )
+  {
+      if ( bmd.getVersion() == null )
+      {
+          throw new IllegalArgumentException( "Version cannot be null." );
+      }
+
+      initialize( bmd.getGroupId(), bmd.getArtifactId(), bmd.getVersion(), bmd.getType()
+                , bmd.getClassifier(), bmd.isOptional(), bmd.getScope(), bmd.getScope() 
+                );
+  }
+
+  public String getInheritedScope()
+  {
+      return inheritedScope;
+  }
+  
+  private void initialize( String groupId, String artifactId, String version, String type, String classifier, boolean optional, String scope, String inheritedScope )
+  {
+      this.inheritedScope = inheritedScope;
+      this.groupId = groupId;
+      this.artifactId = artifactId;
+      this.version = version;
+      //this.scope = scope;
+      this.type = type;
+      this.classifier = classifier;
+      this.optional = optional;
+
+      String desiredScope = Artifact.SCOPE_RUNTIME;
+
+      boolean calc = true;
+
+      if ( inheritedScope == null )
+      {
+          desiredScope = scope;
+      }
+      else if ( Artifact.SCOPE_TEST.equals( scope ) || Artifact.SCOPE_PROVIDED.equals( scope ) )
+      {
+          desiredScope = scope;
+          //calc = false;
+      }
+      else if ( Artifact.SCOPE_COMPILE.equals( scope ) && Artifact.SCOPE_COMPILE.equals( inheritedScope ) )
+      {
+          // added to retain compile artifactScope. Remove if you want compile inherited as runtime
+          desiredScope = Artifact.SCOPE_COMPILE;
+      }
+
+      if ( calc )
+      {
+          if ( Artifact.SCOPE_TEST.equals( inheritedScope ) )
+          {
+              desiredScope = Artifact.SCOPE_TEST;
+          }
+
+          if ( Artifact.SCOPE_PROVIDED.equals( inheritedScope ) )
+          {
+              desiredScope = Artifact.SCOPE_PROVIDED;
+          }
+
+          if ( Artifact.SCOPE_SYSTEM.equals( scope ) )
+          {
+              // system scopes come through unchanged...
+              desiredScope = Artifact.SCOPE_SYSTEM;
+          }
+      }
+      
+      this.scope = desiredScope;
+
+      validateIdentity();
+  }
+
+  private void validateIdentity()
+  {
+      if ( empty( groupId ) )
+      {
+          throw new IllegalArgumentException( "The groupId cannot be empty." );
+      }
+
+      if ( artifactId == null )
+      {
+          throw new IllegalArgumentException( "The artifactId cannot be empty." );
+      }
+
+      if ( type == null )
+      {
+          throw new IllegalArgumentException( "The type cannot be empty." );
+      }
+
+      if ( ( version == null ) )
+      {
+          throw new IllegalArgumentException( "The version cannot be empty." );
+      }
+  }
+
+  private boolean empty( String value )
+  {
+      return ( value == null ) || ( value.trim().length() < 1 );
+  }
+
+  public void setFile( File file )
+  {
+      this.file = file;
+  }
+
+  public File getFile()
+  {
+      return file;
+  }
+
+  public void setStream( InputStream stream )
+  {
+      this.stream = stream;
+  }
+
+  public InputStream getStream()
+  {
+      return stream;
+  }
+  // ----------------------------------------------------------------------
+  //
+  // ----------------------------------------------------------------------
+
+  public String getId()
+  {
+      return getDependencyConflictId() + ":" + getVersion();
+  }
+
+  public String getDependencyConflictId()
+  {
+      StringBuilder sb = new StringBuilder();
+      sb.append( getGroupId() );
+      sb.append( ":" );
+      appendArtifactTypeClassifierString( sb );
+      return sb.toString();
+  }
+
+  private void appendArtifactTypeClassifierString( StringBuilder sb )
+  {
+      sb.append( getArtifactId() );
+      sb.append( ":" );
+      sb.append( getType() );
+      if ( hasClassifier() )
+      {
+          sb.append( ":" );
+          sb.append( getClassifier() );
+      }
+  }
+  
+  public void setPomBlob( byte [] pomBlob )
+  {
+    this.pomBlob = pomBlob;
+  }
+  
+  public byte [] getPomBlob()
+  {
+    return pomBlob;
+  }
+
+  // ----------------------------------------------------------------------
+  // Object overrides
+  // ----------------------------------------------------------------------
+  @Override
+  public String toString()
+  {
+      StringBuilder sb = new StringBuilder();
+      if ( getGroupId() != null )
+      {
+          sb.append( getGroupId() );
+          sb.append( ":" );
+      }
+      appendArtifactTypeClassifierString( sb );
+      sb.append( ":" );
+      
+      if ( getVersion() != null )
+      {
+          sb.append( getVersion() );
+      }
+      
+      if ( scope != null )
+      {
+          sb.append( ":" );
+          sb.append( scope );
+      }
+      return sb.toString();
+  }
+
+  @Override
+  public int hashCode()
+  {
+      int result = 17;
+      result = 37 * result + groupId.hashCode();
+      result = 37 * result + artifactId.hashCode();
+      result = 37 * result + type.hashCode();
+      if ( version != null )
+      {
+          result = 37 * result + version.hashCode();
+      }
+      result = 37 * result + ( classifier != null ? classifier.hashCode() : 0 );
+      return result;
+  }
+
+  @Override
+  public boolean equals( Object o )
+  {
+      if ( o == this )
+      {
+          return true;
+      }
+
+      if ( !( o instanceof Artifact ) )
+      {
+          return false;
+      }
+
+      Artifact a = (Artifact) o;
+
+      if ( !a.getGroupId().equals( groupId ) )
+      {
+          return false;
+      }
+      else if ( !a.getArtifactId().equals( artifactId ) )
+      {
+          return false;
+      }
+      else if ( !a.getVersion().equals( version ) )
+      {
+          return false;
+      }
+      else if ( !a.getType().equals( type ) )
+      {
+          return false;
+      }
+      else if ( a.getClassifier() == null ? classifier != null : !a.getClassifier().equals( classifier ) )
+      {
+          return false;
+      }
+
+      // We don't consider the version range in the comparison, just the resolved version
+
+      return true;
+  }
+
+  public int compareTo( Artifact o )
+  {
+      Artifact a = (Artifact) o;
+
+      int result = groupId.compareTo( a.getGroupId() );
+      if ( result == 0 )
+      {
+          result = artifactId.compareTo( a.getArtifactId() );
+          if ( result == 0 )
+          {
+              result = type.compareTo( a.getType() );
+              if ( result == 0 )
+              {
+                  if ( classifier == null )
+                  {
+                      if ( a.getClassifier() != null )
+                      {
+                          result = 1;
+                      }
+                  }
+                  else
+                  {
+                      if ( a.getClassifier() != null )
+                      {
+                          result = classifier.compareTo( a.getClassifier() );
+                      }
+                      else
+                      {
+                          result = -1;
+                      }
+                  }
+                  if ( result == 0 )
+                  {
+                      // We don't consider the version range in the comparison, just the resolved version
+                      result = version.compareTo( a.getVersion() );
+                  }
+              }
+          }
+      }
+      return result;
+  }
+
+  public String getDownloadUrl()
+  {
+      return downloadUrl;
+  }
+
+  public void setDownloadUrl( String downloadUrl )
+  {
+      this.downloadUrl = downloadUrl;
+  }
+
+  public void setResolvedVersion( String version )
+  {
+      this.version = version;
+      // retain baseVersion
+  }
 }

Modified: maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/VersionRange.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/VersionRange.java?rev=687239&r1=687238&r2=687239&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/VersionRange.java (original)
+++ maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/VersionRange.java Tue Aug 19 21:46:40 2008
@@ -27,6 +27,13 @@
   DefaultArtifactVersion _toVersion;
   boolean _toInclusive = false;
   //--------------------------------------------------------------------------------------------
+  public VersionRange( String range, QualityRange qRange )
+  throws VersionException
+  {
+    this( range );
+    setToQualityRange( qRange );
+  }
+  //--------------------------------------------------------------------------------------------
   public VersionRange( String range )
   throws VersionException
   {

Modified: maven/sandbox/trunk/mercury/mercury-artifact/src/test/java/org/apache/maven/mercury/artifact/version/VersionRangeTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-artifact/src/test/java/org/apache/maven/mercury/artifact/version/VersionRangeTest.java?rev=687239&r1=687238&r2=687239&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-artifact/src/test/java/org/apache/maven/mercury/artifact/version/VersionRangeTest.java (original)
+++ maven/sandbox/trunk/mercury/mercury-artifact/src/test/java/org/apache/maven/mercury/artifact/version/VersionRangeTest.java Tue Aug 19 21:46:40 2008
@@ -75,6 +75,7 @@
     assertFalse( range.includes( "1.0-SNAPSHOT" ) );
     assertTrue( range.includes( "1.1-SNAPSHOT" ) );
     assertTrue( range.includes( "2.0-SNAPSHOT" ) );
+    assertFalse( range.includes( "2.0-20080815.235653-15" ) ); // this is still considered a release :(
     assertTrue( range.includes( "2.0-alpha-1" ) );
     assertFalse( range.includes( "2.0" ) );
   }
@@ -89,6 +90,7 @@
     assertFalse( range.includes( "1.0-SNAPSHOT" ) );
     assertTrue( range.includes( "1.1-SNAPSHOT" ) );
     assertFalse( range.includes( "2.0-SNAPSHOT" ) );
+    assertFalse( range.includes( "2.0-20080815.235653-15" ) );
     assertFalse( range.includes( "2.0-alpha-35" ) );
     assertTrue( range.includes( "2.0-beta-1" ) );
     assertFalse( range.includes( "2.0" ) );
@@ -104,6 +106,7 @@
     assertFalse( range.includes( "1.0-SNAPSHOT" ) );
     assertTrue( range.includes( "1.1-SNAPSHOT" ) );
     assertFalse( range.includes( "2.0-SNAPSHOT" ) );
+    assertFalse( range.includes( "2.0-20080815.235653-15" ) );
     assertTrue( range.includes( "2.0-alpha-35" ) );
     assertTrue( range.includes( "2.0-beta-1" ) );
     assertFalse( range.includes( "2.0" ) );

Modified: maven/sandbox/trunk/mercury/mercury-md/mercury-md-sat/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-md/mercury-md-sat/pom.xml?rev=687239&r1=687238&r2=687239&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-md/mercury-md-sat/pom.xml (original)
+++ maven/sandbox/trunk/mercury/mercury-md/mercury-md-sat/pom.xml Tue Aug 19 21:46:40 2008
@@ -57,12 +57,19 @@
   		<version>1.0.0-alpha-1-SNAPSHOT</version>
   	</dependency>
 	<!--  test deps -->
-  	<dependency>
-  		<groupId>org.apache.maven.mercury</groupId>
-  		<artifactId>mercury-repo-local-m2</artifactId>
-  		<version>1.0.0-alpha-1-SNAPSHOT</version>
-  		<scope>test</scope>
-  	</dependency>
+    <dependency>
+      <groupId>org.apache.maven.mercury</groupId>
+      <artifactId>mercury-repo-local-m2</artifactId>
+      <version>1.0.0-alpha-1-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.mercury</groupId>
+      <artifactId>mercury-repo-local-m2</artifactId>
+      <version>1.0.0-alpha-1-SNAPSHOT</version>
+      <classifier>tests</classifier>
+      <scope>test</scope>
+    </dependency>
   	<dependency>
   		<groupId>org.apache.maven.mercury</groupId>
   		<artifactId>mercury-repo-remote-m2</artifactId>

Modified: maven/sandbox/trunk/mercury/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java?rev=687239&r1=687238&r2=687239&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java (original)
+++ maven/sandbox/trunk/mercury/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java Tue Aug 19 21:46:40 2008
@@ -9,7 +9,7 @@
 import org.apache.maven.mercury.artifact.ArtifactMetadata;
 import org.apache.maven.mercury.artifact.ArtifactScopeEnum;
 import org.apache.maven.mercury.builder.api.MetadataProcessor;
-import org.apache.maven.mercury.repository.MetadataProcessorMock;
+import org.apache.maven.mercury.repository.local.m2.MetadataProcessorMock;
 import org.apache.maven.mercury.repository.api.Repository;
 import org.apache.maven.mercury.repository.local.m2.LocalRepositoryM2;
 

Modified: maven/sandbox/trunk/mercury/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/repository/metadata/MetadataReaderTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/repository/metadata/MetadataReaderTest.java?rev=687239&r1=687238&r2=687239&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/repository/metadata/MetadataReaderTest.java (original)
+++ maven/sandbox/trunk/mercury/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/repository/metadata/MetadataReaderTest.java Tue Aug 19 21:46:40 2008
@@ -12,7 +12,7 @@
 import junit.framework.TestCase;
 
 import org.apache.maven.mercury.builder.api.MetadataProcessingException;
-import org.apache.maven.mercury.repository.MetadataProcessorMock;
+import org.apache.maven.mercury.repository.local.m2.MetadataProcessorMock;
 import org.apache.maven.mercury.repository.api.RepositoryException;
 import org.apache.maven.mercury.repository.api.RepositoryReader;
 import org.apache.maven.mercury.repository.metadata.io.xpp3.MetadataXpp3Reader;

Modified: maven/sandbox/trunk/mercury/mercury-md/mercury-md-shared/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-md/mercury-md-shared/pom.xml?rev=687239&r1=687238&r2=687239&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-md/mercury-md-shared/pom.xml (original)
+++ maven/sandbox/trunk/mercury/mercury-md/mercury-md-shared/pom.xml Tue Aug 19 21:46:40 2008
@@ -60,6 +60,11 @@
   		<artifactId>mercury-artifact</artifactId>
   		<version>1.0.0-alpha-1-SNAPSHOT</version>
   	</dependency>
+  	<dependency>
+  		<groupId>org.apache.maven.mercury</groupId>
+  		<artifactId>mercury-util</artifactId>
+  		<version>1.0.0-alpha-1-SNAPSHOT</version>
+  	</dependency>
   </dependencies>
   
 </project>
\ No newline at end of file

Modified: maven/sandbox/trunk/mercury/mercury-md/mercury-md-shared/src/main/java/org/apache/maven/mercury/repository/metadata/MetadataBuilder.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-md/mercury-md-shared/src/main/java/org/apache/maven/mercury/repository/metadata/MetadataBuilder.java?rev=687239&r1=687238&r2=687239&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-md/mercury-md-shared/src/main/java/org/apache/maven/mercury/repository/metadata/MetadataBuilder.java (original)
+++ maven/sandbox/trunk/mercury/mercury-md/mercury-md-shared/src/main/java/org/apache/maven/mercury/repository/metadata/MetadataBuilder.java Tue Aug 19 21:46:40 2008
@@ -105,16 +105,37 @@
     
     return res; 
   }
-
-
   /**
-   * apply an of operation to the specified serialized Metadata object
+   * apply a list of operators to the specified serialized Metadata object
    * 
    * @param metadataBytes - serialized Metadata object
-   * @param op - operation
+   * @param mutators - operators
    * @return changed serialized object
    * @throws MetadataException
    */
+  public static byte [] changeMetadata( Metadata metadata, List<MetadataOperation> mutators )
+  throws MetadataException
+  {
+    
+    if( metadata == null )
+    {
+      metadata = new Metadata();
+    }
+
+    if( mutators != null && mutators.size() > 0 )
+      for( MetadataOperation op : mutators )
+      {
+        boolean changed = op.perform( metadata );
+      }
+    
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    write( metadata, out );
+    
+    byte [] res = out.toByteArray(); 
+    
+    return res; 
+  }
+
   public static byte [] changeMetadata( byte [] metadataBytes, MetadataOperation op )
   throws MetadataException
   {
@@ -123,6 +144,15 @@
     
     return changeMetadata( metadataBytes, ops );
   }
+
+  public static byte [] changeMetadata( Metadata metadata, MetadataOperation op )
+  throws MetadataException
+  {
+    ArrayList<MetadataOperation> ops = new ArrayList<MetadataOperation>(1);
+    ops.add( op );
+    
+    return changeMetadata( metadata, ops );
+  }
   
   /**
    * update snapshot timestamp to now

Modified: maven/sandbox/trunk/mercury/mercury-md/mercury-md-shared/src/test/java/org/apache/maven/mercury/repository/metadata/MetadataBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-md/mercury-md-shared/src/test/java/org/apache/maven/mercury/repository/metadata/MetadataBuilderTest.java?rev=687239&r1=687238&r2=687239&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-md/mercury-md-shared/src/test/java/org/apache/maven/mercury/repository/metadata/MetadataBuilderTest.java (original)
+++ maven/sandbox/trunk/mercury/mercury-md/mercury-md-shared/src/test/java/org/apache/maven/mercury/repository/metadata/MetadataBuilderTest.java Tue Aug 19 21:46:40 2008
@@ -11,6 +11,7 @@
 
 import junit.framework.TestCase;
 
+import org.apache.maven.mercury.util.FileUtil;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
 /**
@@ -92,7 +93,7 @@
   throws FileNotFoundException, IOException, XmlPullParserException, MetadataException
   {
     File groupMd = new File( testBase, "group-maven-metadata.xml");
-    byte [] targetBytes = readRawData( groupMd );
+    byte [] targetBytes = FileUtil.readRawData( groupMd );
 
     Metadata source = new Metadata();
     source.setGroupId( "a" );
@@ -107,7 +108,7 @@
     
     File resFile = new File( testBase, "group-maven-metadata-write.xml");
 
-    writeRawData( resFile, resBytes );
+    FileUtil.writeRawData( resFile, resBytes );
     
      Metadata mmd = MetadataBuilder.read( new FileInputStream(resFile) );
 
@@ -134,13 +135,13 @@
   throws FileNotFoundException, IOException, XmlPullParserException, MetadataException
   {
     File groupMd = new File( testBase, "group-maven-metadata.xml");
-    byte [] targetBytes = readRawData( groupMd );
+    byte [] targetBytes = FileUtil.readRawData( groupMd );
 
     byte [] resBytes = MetadataBuilder.changeMetadata( targetBytes, new AddVersionOperation( new StringOperand("5") ) );
     
     File resFile = new File( testBase, "group-maven-metadata-write.xml");
 
-    writeRawData( resFile, resBytes );
+    FileUtil.writeRawData( resFile, resBytes );
     
      Metadata mmd = MetadataBuilder.read( new FileInputStream(resFile) );
 
@@ -166,13 +167,13 @@
   throws FileNotFoundException, IOException, XmlPullParserException, MetadataException
   {
     File groupMd = new File( testBase, "group-maven-metadata.xml");
-    byte [] targetBytes = readRawData( groupMd );
+    byte [] targetBytes = FileUtil.readRawData( groupMd );
 
     byte [] resBytes = MetadataBuilder.changeMetadata( targetBytes, new RemoveVersionOperation( new StringOperand("1") ) );
     
     File resFile = new File( testBase, "group-maven-metadata-write.xml");
 
-    writeRawData( resFile, resBytes );
+    FileUtil.writeRawData( resFile, resBytes );
     
      Metadata mmd = MetadataBuilder.read( new FileInputStream(resFile) );
 
@@ -197,7 +198,7 @@
   throws FileNotFoundException, IOException, XmlPullParserException, MetadataException
   {
     File groupMd = new File( testBase, "group-maven-metadata.xml");
-    byte [] targetBytes = readRawData( groupMd );
+    byte [] targetBytes = FileUtil.readRawData( groupMd );
     
     Snapshot sn = new Snapshot();
     sn.setLocalCopy( false );
@@ -209,7 +210,7 @@
     
     File resFile = new File( testBase, "group-maven-metadata-write.xml");
 
-    writeRawData( resFile, resBytes );
+    FileUtil.writeRawData( resFile, resBytes );
     
      Metadata mmd = MetadataBuilder.read( new FileInputStream(resFile) );
 
@@ -224,7 +225,7 @@
      assertEquals( ts, snapshot.getTimestamp() );
      
      // now let's drop sn
-     targetBytes = readRawData( resFile );
+     targetBytes = FileUtil.readRawData( resFile );
      resBytes = MetadataBuilder.changeMetadata( targetBytes, new SetSnapshotOperation( new SnapshotOperand(null) ) );
      
      Metadata mmd2 = MetadataBuilder.read( new ByteArrayInputStream(resBytes) );
@@ -244,7 +245,7 @@
   throws FileNotFoundException, IOException, XmlPullParserException, MetadataException
   {
     File groupMd = new File( testBase, "group-maven-metadata.xml");
-    byte [] targetBytes = readRawData( groupMd );
+    byte [] targetBytes = FileUtil.readRawData( groupMd );
 
     ArrayList<MetadataOperation> ops = new ArrayList<MetadataOperation>(2);
     ops.add( new RemoveVersionOperation( new StringOperand("1") ) );
@@ -254,7 +255,7 @@
     
     File resFile = new File( testBase, "group-maven-metadata-write.xml");
 
-    writeRawData( resFile, resBytes );
+    FileUtil.writeRawData( resFile, resBytes );
     
      Metadata mmd = MetadataBuilder.read( new FileInputStream(resFile) );
 
@@ -275,55 +276,6 @@
      assertTrue( versions.contains("4") );
      assertTrue( versions.contains("8") );
   }
-  //---------------------------------------------------------------------------------------------------------------
-  private byte[] readRawData( File file )
-  throws IOException
-  {
-    if( ! file.exists() )
-      return null;
-    
-    FileInputStream fis = null;
-    
-    try
-    {
-      fis = new FileInputStream( file );
-      int len = (int)file.length();
-      byte [] pom = new byte [ len ];
-      fis.read( pom );
-      return pom;
-    }
-    catch( IOException e )
-    {
-      throw  e;
-    }
-    finally
-    {
-      if( fis != null ) try { fis.close(); } catch( Exception any ) {}
-    }
-  }
-  //---------------------------------------------------------------------------------------------------------------
-  private void writeRawData( File file, byte [] bytes )
-  throws IOException
-  {
-    if( file.exists() )
-      file.delete();
-    
-    FileOutputStream fos = null;
-    
-    try
-    {
-      fos = new FileOutputStream( file );
-      fos.write( bytes );
-    }
-    catch( IOException e )
-    {
-      throw  e;
-    }
-    finally
-    {
-      if( fos != null ) try { fos.close(); } catch( Exception any ) {}
-    }
-  }
   //-------------------------------------------------------------------------
   //-------------------------------------------------------------------------
 }

Modified: maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/AbstractRepository.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/AbstractRepository.java?rev=687239&r1=687238&r2=687239&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/AbstractRepository.java (original)
+++ maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/AbstractRepository.java Tue Aug 19 21:46:40 2008
@@ -9,6 +9,7 @@
 import org.apache.maven.mercury.artifact.QualityEnum;
 import org.apache.maven.mercury.artifact.QualityRange;
 import org.apache.maven.mercury.builder.api.MetadataProcessor;
+import org.apache.maven.mercury.transport.api.Server;
 import org.codehaus.plexus.i18n.DefaultLanguage;
 import org.codehaus.plexus.i18n.Language;
 
@@ -57,10 +58,14 @@
   //---------------------------------------------------------------------------
   protected String             type = DEFAULT_REPOSITORY_TYPE;
   
-  protected QualityRange       qualityRange = QualityRange.ALL;
+  protected QualityRange       repositoryQualityRange = QualityRange.ALL;
+  
+  protected QualityRange       versionRangeQualityRange = QualityRange.ALL;
 
   protected RepositoryReader   reader;
   protected RepositoryWriter   writer;
+  
+  protected Server server;
   //---------------------------------------------------------------------------
   public AbstractRepository( String id, String type )
   {
@@ -73,13 +78,33 @@
     return id;
   }
   //---------------------------------------------------------------------------
+  public QualityRange getRepositoryQualityRange()
+  {
+    return repositoryQualityRange;
+  }
+  //---------------------------------------------------------------------------
+  public void setRepositoryQualityRange(
+      QualityRange repositoryQualityRange )
+  {
+    this.repositoryQualityRange = repositoryQualityRange;
+  }
+  //---------------------------------------------------------------------------
+  public QualityRange getVersionRangeQualityRange()
+  {
+    return versionRangeQualityRange;
+  }
+  //---------------------------------------------------------------------------
+  public void setVersionRangeQualityRange( QualityRange versionRangeQualityRange )
+  {
+    this.versionRangeQualityRange = versionRangeQualityRange;
+  }
+  //---------------------------------------------------------------------------
   public String getDefaultReadProtocol()
   {
     return defaultReadProtocol;
   }
   //---------------------------------------------------------------------------
-  public void setDefaultReadProtocol(
-      String defaultReadProtocol )
+  public void setDefaultReadProtocol( String defaultReadProtocol )
   {
     this.defaultReadProtocol = defaultReadProtocol;
   }
@@ -172,17 +197,22 @@
   //---------------------------------------------------------------------------
   public boolean isSnapshots()
   {
-    return qualityRange.isAcceptedQuality( Quality.SNAPSHOT_QUALITY );
+    return repositoryQualityRange.isAcceptedQuality( Quality.SNAPSHOT_QUALITY );
   }
   //---------------------------------------------------------------------------
   public boolean isReleases()
   {
-    return qualityRange.isAcceptedQuality( Quality.RELEASE_QUALITY );
+    return repositoryQualityRange.isAcceptedQuality( Quality.RELEASE_QUALITY );
   }
   //---------------------------------------------------------------------------
   public boolean isAcceptedQuality( Quality quality )
   {
-    return qualityRange.isAcceptedQuality( quality );
+    return repositoryQualityRange.isAcceptedQuality( quality );
+  }
+  //---------------------------------------------------------------------------
+  public Server getServer()
+  {
+    return server;
   }
   //---------------------------------------------------------------------------
   //---------------------------------------------------------------------------

Modified: maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/Repository.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/Repository.java?rev=687239&r1=687238&r2=687239&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/Repository.java (original)
+++ maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/Repository.java Tue Aug 19 21:46:40 2008
@@ -2,7 +2,9 @@
 
 import org.apache.maven.mercury.artifact.Quality;
 import org.apache.maven.mercury.artifact.QualityEnum;
+import org.apache.maven.mercury.artifact.QualityRange;
 import org.apache.maven.mercury.builder.api.MetadataProcessor;
+import org.apache.maven.mercury.transport.api.Server;
 
 
 /*
@@ -64,6 +66,15 @@
    */
   public boolean isAcceptedQuality( Quality quality );
   
+  /**
+   * defines how VersionRnage treats upper boundary - which Artifacts should be treated as belonging 
+   * to the vicinity - http://docs.codehaus.org/x/twDPBQ  
+   * 
+   * @return
+   * @throws NonExistentProtocolException if protocol not supported
+   */
+  public QualityRange getVersionRangeQualityRange();
+  
     /**
      * get default reader, if any
      * 
@@ -98,4 +109,11 @@
      */
     RepositoryWriter getWriter( String protocol )
     throws NonExistentProtocolException;
+    
+    /**
+     * returns server where this repo resides
+     * 
+     * @return server
+     */
+    Server getServer();
 }

Modified: maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/pom.xml?rev=687239&r1=687238&r2=687239&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/pom.xml (original)
+++ maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/pom.xml Tue Aug 19 21:46:40 2008
@@ -21,5 +21,21 @@
   		<version>1.8</version>
   		<scope>test</scope>
   	</dependency>
+  	<dependency>
+  		<groupId>org.apache.maven.mercury</groupId>
+  		<artifactId>mercury-md-shared</artifactId>
+  		<version>1.0.0-alpha-1-SNAPSHOT</version>
+  	</dependency>
+  	<dependency>
+  		<groupId>org.apache.maven.mercury</groupId>
+  		<artifactId>mercury-util</artifactId>
+  		<version>1.0.0-alpha-1-SNAPSHOT</version>
+  	</dependency>
+  	<dependency>
+  		<groupId>org.apache.maven.mercury</groupId>
+  		<artifactId>mercury-crypto-basic</artifactId>
+  		<version>1.0.0-alpha-1-SNAPSHOT</version>
+      <scope>test</scope>
+  	</dependency>
   </dependencies>
 </project>
\ No newline at end of file

Modified: maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryM2.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryM2.java?rev=687239&r1=687238&r2=687239&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryM2.java (original)
+++ maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryM2.java Tue Aug 19 21:46:40 2008
@@ -2,12 +2,14 @@
 
 import java.io.File;
 
+import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
 import org.apache.maven.mercury.builder.api.MetadataProcessor;
 import org.apache.maven.mercury.repository.api.AbstractRepository;
 import org.apache.maven.mercury.repository.api.LocalRepository;
 import org.apache.maven.mercury.repository.api.NonExistentProtocolException;
 import org.apache.maven.mercury.repository.api.RepositoryReader;
 import org.apache.maven.mercury.repository.api.RepositoryWriter;
+import org.apache.maven.mercury.transport.api.Server;
 
 public class LocalRepositoryM2
 extends AbstractRepository
@@ -15,6 +17,13 @@
 {
     private File directory;
     //----------------------------------------------------------------------------------
+    public LocalRepositoryM2( Server server )
+    {
+        super( server.getId(), DEFAULT_REPOSITORY_TYPE );
+        this.directory = new File( server.getURL().getFile() );
+        this.server = server;
+    }
+    //----------------------------------------------------------------------------------
     public LocalRepositoryM2( String id, File directory )
     {
         super( id, DEFAULT_REPOSITORY_TYPE );
@@ -40,21 +49,25 @@
       return reader;
     }
     //----------------------------------------------------------------------------------
+    // TODO oleg: what happens in multi-threaded execution?? 
     public RepositoryReader getReader( MetadataProcessor processor, String protocol )
     {
        return getReader(processor);
     }
     //----------------------------------------------------------------------------------
+    // TODO oleg: what happens in multi-threaded execution?? 
     public RepositoryWriter getWriter()
     {
-      // TODO Auto-generated method stub
-      return null;
+      if( writer == null )
+        writer = new LocalRepositoryWriterM2(this);
+      
+      return writer;
     }
     //----------------------------------------------------------------------------------
     public RepositoryWriter getWriter( String protocol )
         throws NonExistentProtocolException
     {
-      return null;
+      return getWriter();
     }
     //----------------------------------------------------------------------------------
     public boolean isLocal()

Modified: maven/sandbox/trunk/mercury/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/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java?rev=687239&r1=687238&r2=687239&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java (original)
+++ maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java Tue Aug 19 21:46:40 2008
@@ -23,6 +23,7 @@
 import org.apache.maven.mercury.repository.api.RepositoryException;
 import org.apache.maven.mercury.repository.api.RepositoryOperationResult;
 import org.apache.maven.mercury.repository.api.RepositoryReader;
+import org.apache.maven.mercury.util.FileUtil;
 import org.codehaus.plexus.i18n.DefaultLanguage;
 import org.codehaus.plexus.i18n.Language;
 
@@ -76,18 +77,35 @@
     {
       DefaultArtifact da = bmd instanceof DefaultArtifact ? (DefaultArtifact)bmd : new DefaultArtifact( bmd );
 
-      File binary = new File( _repoDir, pathOf( bmd, null, null) );
+      File binary = new File( _repoDir, relPathOf( bmd, null, null) );
       if( ! binary.exists() )
       {
-        res.add( new RepositoryException( _lang.getMessage( "binary.not.found", binary.getAbsolutePath() ) ) );
+        res.add( new RepositoryException( _lang.getMessage( "binary.not.found", bmd.toString(), binary.getAbsolutePath() ) ) );
         continue;
       }
 
       da.setFile( binary );
+      
+      File pomFile = new File( _repoDir, relPathOf( bmd, null, "pom") );
+      if( pomFile.exists() )
+      {
+        try
+        {
+          da.setPomBlob( FileUtil.readRawData( pomFile ) );
+        }
+        catch( Exception e )
+        {
+          throw new RepositoryException( e );
+        }
+      }
+      else
+      {
+        _log.warn( _lang.getMessage( "pom.not.found", bmd.toString()) );
+      }
 
       res.add( da );
     }
-    return null;
+    return res;
   }
   //---------------------------------------------------------------------------------------------------------------
   /**
@@ -108,7 +126,7 @@
       String pomPath = bmd.getGroupId().replace( '.', '/' )
                       + "/" + bmd.getArtifactId()
                       + "/" + bmd.getVersion()
-                      + "/" + bmd.getBaseName()
+                      + "/" + bmd.getArtifactId()+'-'+bmd.getVersion()
                       + ".pom"
                       ;
       
@@ -165,7 +183,7 @@
       VersionRange versionQuery;
       try
       {
-        versionQuery = new VersionRange( bmd.getVersion() );
+        versionQuery = new VersionRange( bmd.getVersion(), _repo.getVersionRangeQualityRange() );
       }
       catch( VersionException e )
       {
@@ -206,10 +224,10 @@
   public byte[] readRawData( ArtifactBasicMetadata bmd, String classifier, String type )
   throws MetadataProcessingException
   {
-    return readRawData( pathOf(bmd, classifier, type) );
+    return readRawData( relPathOf(bmd, classifier, type) );
   }
   //---------------------------------------------------------------------------------------------------------------
-  private String pathOf( ArtifactBasicMetadata bmd, String classifier, String type )
+  private static String relPathOf( ArtifactBasicMetadata bmd, String classifier, String type )
   {
     String bmdPath = bmd.getGroupId().replace( '.', '/' )+"/"+bmd.getArtifactId()+"/"+bmd.getVersion();
     
@@ -246,6 +264,16 @@
     }
   }
   //---------------------------------------------------------------------------------------------------------------
+  public String readStringData( String path )
+  throws MetadataProcessingException
+  {
+    byte [] data = readRawData( path );
+    if( data == null )
+      return null;
+
+    return new String( data );
+  }
+  //---------------------------------------------------------------------------------------------------------------
   public boolean canHandle( String protocol )
   {
     return AbstractRepository.DEFAULT_LOCAL_READ_PROTOCOL.equals( protocol );

Modified: maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryWriterM2.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryWriterM2.java?rev=687239&r1=687238&r2=687239&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryWriterM2.java (original)
+++ maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryWriterM2.java Tue Aug 19 21:46:40 2008
@@ -1,19 +1,43 @@
 package org.apache.maven.mercury.repository.local.m2;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
 
 import org.apache.maven.mercury.artifact.Artifact;
+import org.apache.maven.mercury.crypto.api.StreamObserver;
+import org.apache.maven.mercury.crypto.api.StreamObserverException;
+import org.apache.maven.mercury.crypto.api.StreamVerifier;
+import org.apache.maven.mercury.crypto.api.StreamVerifierException;
+import org.apache.maven.mercury.crypto.api.StreamVerifierFactory;
 import org.apache.maven.mercury.repository.api.AbstractRepository;
 import org.apache.maven.mercury.repository.api.LocalRepository;
 import org.apache.maven.mercury.repository.api.Repository;
 import org.apache.maven.mercury.repository.api.RepositoryException;
 import org.apache.maven.mercury.repository.api.RepositoryWriter;
+import org.apache.maven.mercury.repository.metadata.AddVersionOperation;
+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.repository.metadata.StringOperand;
+import org.apache.maven.mercury.transport.api.Server;
+import org.apache.maven.mercury.util.FileUtil;
+import org.codehaus.plexus.i18n.DefaultLanguage;
+import org.codehaus.plexus.i18n.Language;
+import org.codehaus.plexus.util.FileUtils;
 
 public class LocalRepositoryWriterM2
 implements RepositoryWriter
 {
   private static final org.slf4j.Logger _log = org.slf4j.LoggerFactory.getLogger( LocalRepositoryWriterM2.class ); 
+  private static final Language _lang = new DefaultLanguage( LocalRepositoryReaderM2.class );
   //---------------------------------------------------------------------------------------------------------------
   private static final String [] _protocols = new String [] { "file" };
   
@@ -54,14 +78,170 @@
   {
   }
   //---------------------------------------------------------------------------------------------------------------
+  public void writeArtifact( Collection<Artifact> artifacts )
+      throws RepositoryException
+  {
+    if( artifacts == null || artifacts.size() < 1 )
+      return;
+    
+    Set<StreamVerifierFactory> vFacs = null;
+    Server server = _repo.getServer();
+    if( server != null && server.hasStreamVerifierFactories() )
+      vFacs = server.getStreamVerifierFactories();
+    
+    if( vFacs == null ) // let it be empty, but not null
+      vFacs = new HashSet<StreamVerifierFactory>(1);
+      
+    for( Artifact artifact : artifacts )
+    {
+      writeArtifact( artifact, vFacs );
+    }
+  }
   //---------------------------------------------------------------------------------------------------------------
-  /* (non-Javadoc)
-   * @see org.apache.maven.mercury.repository.api.RepositoryWriter#writeArtifact(java.util.Collection)
-   */
-  public void writeArtifact( Collection<Artifact> artifact )
+  public void writeArtifact( Artifact artifact, Set<StreamVerifierFactory> vFacs )
       throws RepositoryException
   {
-    // TODO Auto-generated method stub
+    if( artifact == null )
+      return;
+    
+    boolean isPom = "pom".equals( artifact.getType() );
+    
+    byte [] pomBlob = artifact.getPomBlob();
+    boolean hasPomBlob = pomBlob != null && pomBlob.length > 0;
+    
+    InputStream in = artifact.getStream();
+    if( in == null )
+    {
+      File aFile = artifact.getFile();
+      if( aFile == null && !isPom )
+      {
+        throw new RepositoryException( _lang.getMessage( "artifact.no.stream", artifact.toString() ) );
+      }
+
+      try
+      {
+        in = new FileInputStream( aFile );
+      }
+      catch( FileNotFoundException e )
+      {
+        if( !isPom )
+          throw new RepositoryException( e );
+      }
+    }
+
+
+    String relGroupPath = artifact.getGroupId().replace( '.', '/' )+"/"+artifact.getArtifactId();
+    String relVersionPath = relGroupPath + '/' + artifact.getVersion();
+
+    try
+    {
+      if( isPom )
+      {
+        if( in == null && !hasPomBlob )
+          throw new RepositoryException( _lang.getMessage( "pom.artifact.no.stream", artifact.toString() ) );
+        
+        if( in != null )
+        {
+          byte [] pomBlobBytes = FileUtil.readRawData( in );
+          hasPomBlob = pomBlobBytes != null && pomBlobBytes.length > 0;
+          if( hasPomBlob )
+            pomBlob = pomBlobBytes;
+        }
+          
+      }
+      
+      String fName = _repoDir.getAbsolutePath()+'/'+relVersionPath+'/'+artifact.getBaseName()+'.'+artifact.getType();
+      
+      if( !isPom )
+      {
+        // first - take care of the binary
+        writeFile( in, vFacs , fName );
+        
+        // if classier - nothing else to do :)
+        if( artifact.hasClassifier() )
+          return;
+
+        File groupMd = new File( _repoDir, relGroupPath+'/'+"maven-metadata.xml");
+        Metadata gmd = null;
+        
+        if( groupMd.exists() )
+          gmd = MetadataBuilder.read( new FileInputStream(groupMd) );
+        else
+        {
+          gmd = new Metadata();
+          gmd.setGroupId( artifact.getGroupId() );
+          gmd.setArtifactId( artifact.getArtifactId() );
+          gmd.setVersion( artifact.getVersion() );
+        }
+        
+        byte [] resBytes = MetadataBuilder.changeMetadata( 
+                        gmd
+                      , new AddVersionOperation( new StringOperand(artifact.getVersion()) ) 
+                                                          );
+
+        FileUtil.writeRawData( groupMd, resBytes );
+      }
+      
+      if( hasPomBlob )
+      {
+        writeFile( pomBlob, vFacs , _repoDir.getAbsolutePath()+'/'+relVersionPath+'/'+artifact.getBaseName()+".pom" );
+      }
+        
+    }
+    catch( Exception e )
+    {
+      throw new RepositoryException( e );
+    }
+    
+  }
+  //---------------------------------------------------------------------------------------------------------------
+  private static void writeFile( byte [] bytes, Set<StreamVerifierFactory> vFacs, String fName )
+  throws IOException, StreamObserverException
+  {
+    ByteArrayInputStream bais = new ByteArrayInputStream( bytes );
+    writeFile( bais, vFacs, fName );
+  }
+  //---------------------------------------------------------------------------------------------------------------
+  private static void writeFile( InputStream in, Set<StreamVerifierFactory> vFacs, String fName )
+  throws IOException, StreamObserverException
+  {
+    byte [] buf = new byte[ 10240 ];
+    int n = -1;
+    HashSet<StreamVerifier> vSet = new HashSet<StreamVerifier>( vFacs.size() );
+    
+    for( StreamVerifierFactory vf : vFacs )
+      vSet.add( vf.newInstance() );
+    
+    FileOutputStream fout = null;
+    
+    try
+    {
+      File f = new File( fName );
+      f.getParentFile().mkdirs();
+      
+      fout = new FileOutputStream( f );
+      
+      while( (n = in.read( buf )) != -1 )
+      {
+        for( StreamVerifier sv : vSet )
+          sv.bytesReady( buf, 0, n );
+        
+        fout.write( buf, 0, n );
+      }
+      
+      for( StreamVerifier sv : vSet )
+      {
+        String sig = sv.getSignature();
+        FileUtil.writeRawData( new File( fName+sv.getAttributes().getExtension() ), sig );
+      }
+      
+    }
+    finally
+    {
+      if( fout != null ) try { fout.close(); } catch( Exception any ) {}
+    }
     
   }
+  //---------------------------------------------------------------------------------------------------------------
+  //---------------------------------------------------------------------------------------------------------------
 }

Modified: maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/Messages.properties
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/Messages.properties?rev=687239&r1=687238&r2=687239&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/Messages.properties (original)
+++ maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/Messages.properties Tue Aug 19 21:46:40 2008
@@ -1,3 +1,6 @@
 bad.repository.type=repository should implement LocalRepository, instead got {0}
 empty.query=received empty query - {0}
-binary.not.found=Artifacts's binary {0} not found in the repository 
\ No newline at end of file
+binary.not.found=Artifact {0} binary at {1} not found 
+pom.not.found=Artifact {0} - binary exists, but POM not found in the repository 
+artifact.no.stream=Cannot find either input stream or file, associated with artifact {0}
+pom.artifact.no.stream=Cannot find either pom blob, input stream or file, associated with artifact {0}
\ No newline at end of file

Modified: maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2Test.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2Test.java?rev=687239&r1=687238&r2=687239&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2Test.java (original)
+++ maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2Test.java Tue Aug 19 21:46:40 2008
@@ -2,18 +2,21 @@
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
+import junit.framework.TestCase;
+
 import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
 import org.apache.maven.mercury.artifact.ArtifactMetadata;
+import org.apache.maven.mercury.artifact.DefaultArtifact;
+import org.apache.maven.mercury.artifact.QualityRange;
 import org.apache.maven.mercury.builder.api.MetadataProcessor;
 import org.apache.maven.mercury.repository.api.RepositoryException;
 import org.apache.maven.mercury.repository.api.RepositoryOperationResult;
 import org.apache.maven.mercury.repository.api.RepositoryReader;
-
-import junit.framework.TestCase;
+import org.apache.maven.mercury.repository.api.RepositoryWriter;
+import org.apache.maven.mercury.util.FileUtil;
 
 /**
  *
@@ -71,6 +74,8 @@
   public void testReadReleaseRange()
   throws IllegalArgumentException, RepositoryException
   {
+    repo.setRepositoryQualityRange( QualityRange.RELEASES_ONLY );
+  
     bmd = new ArtifactBasicMetadata("a:a:3");
     query.add( bmd );
     Map<ArtifactBasicMetadata, RepositoryOperationResult<ArtifactBasicMetadata>> res = reader.readVersions( query );
@@ -89,7 +94,7 @@
     assertNotNull( qr );
     assertTrue( qr.size() > 1 );
     
-//    assertFalse( qr.contains( new ArtifactBasicMetadata("a:a:5-SNAPSHOT") ) );
+    assertFalse( qr.contains( new ArtifactBasicMetadata("a:a:5-SNAPSHOT") ) );
     
     System.out.println("query "+bmd+"->"+qr);
     
@@ -111,6 +116,33 @@
     
   }
   //------------------------------------------------------------------------------
+  public void testReadArtifacts()
+  throws IllegalArgumentException, RepositoryException
+  {
+    bmd = new ArtifactBasicMetadata("a:a:3");
+    query.add( bmd );
+
+    RepositoryOperationResult<DefaultArtifact> ror = reader.readArtifacts( query );
+    
+    assertNotNull( ror );
+    assertFalse( ror.hasExceptions() );
+    assertTrue( ror.hasResults() );
+    
+    List<DefaultArtifact> res = ror.getResults();
+    
+    assertNotNull( res );
+    assertEquals( 1, res.size() );
+    
+    DefaultArtifact da = res.get( 0 );
+    
+    assertNotNull( da );
+    assertNotNull( da.getFile() );
+    assertTrue( da.getFile().exists() );
+    assertNotNull( da.getPomBlob() );
+    
+System.out.println(da.getPomBlob());
+  }
+  //------------------------------------------------------------------------------
   public void testReadLatest()
   {
     // TODO

Copied: maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Server.java (from r686026, maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Server.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Server.java?p2=maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Server.java&p1=maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Server.java&r1=686026&r2=687239&rev=687239&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Server.java (original)
+++ maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Server.java Tue Aug 19 21:46:40 2008
@@ -33,7 +33,7 @@
   private boolean                     requireEncryption = false;
   private boolean                     requireTrustedServer = false;
 
-  private Set<StreamVerifierFactory>  streamObserverFactories;
+  private Set<StreamVerifierFactory>  streamVerifierFactories;
 
   public Server( String id, URL url )
   {
@@ -97,14 +97,19 @@
     return this.serverCredentials;
   }
 
-  public Set<StreamVerifierFactory> getStreamObserverFactories()
+  public boolean hasStreamVerifierFactories()
   {
-    return streamObserverFactories;
+    return streamVerifierFactories != null && streamVerifierFactories.size() > 0;
   }
 
-  public void setStreamObserverFactories( Set<StreamVerifierFactory> factories )
+  public Set<StreamVerifierFactory> getStreamVerifierFactories()
   {
-    streamObserverFactories = factories;
+    return streamVerifierFactories;
+  }
+
+  public void setStreamVerifierFactories( Set<StreamVerifierFactory> factories )
+  {
+    streamVerifierFactories = factories;
   }
 
   public boolean isRequireEncryption()

Propchange: maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Server.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-file/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-file/pom.xml?rev=687239&r1=687238&r2=687239&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-file/pom.xml (original)
+++ maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-file/pom.xml Tue Aug 19 21:46:40 2008
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>mercury-transport-file</artifactId>
-  <name>Mercury File Transport:   ${project.version}</name>
+  <name>Mercury File Transport:         ${project.version}</name>
   <description/>
   <parent>
   	<groupId>org.apache.maven.mercury</groupId>
@@ -42,6 +42,11 @@
   		<artifactId>mercury-crypto-basic</artifactId>
   		<version>1.0.0-alpha-1-SNAPSHOT</version>
   	</dependency>
+  	<dependency>
+  		<groupId>org.apache.maven.mercury</groupId>
+  		<artifactId>mercury-util</artifactId>
+  		<version>1.0.0-alpha-1-SNAPSHOT</version>
+  	</dependency>
   </dependencies>
 
 </project>

Modified: maven/sandbox/trunk/mercury/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/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DefaultDeployer.java?rev=687239&r1=687238&r2=687239&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DefaultDeployer.java (original)
+++ maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DefaultDeployer.java Tue Aug 19 21:46:40 2008
@@ -332,7 +332,7 @@
     throws StreamVerifierException
     {
         HashSet<StreamObserver> observers = new HashSet<StreamObserver>();
-        Set<StreamVerifierFactory> factories = server.getStreamObserverFactories();
+        Set<StreamVerifierFactory> factories = server.getStreamVerifierFactories();
         for (StreamVerifierFactory f:factories)
         {
             observers.add( f.newInstance() );

Modified: maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/DefaultRetriever.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/DefaultRetriever.java?rev=687239&r1=687238&r2=687239&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/DefaultRetriever.java (original)
+++ maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/DefaultRetriever.java Tue Aug 19 21:46:40 2008
@@ -314,7 +314,7 @@
         HashSet<StreamObserver> observers = new HashSet<StreamObserver>();
         if (server != null)
         {
-            Set<StreamVerifierFactory> factories = server.getStreamObserverFactories();
+            Set<StreamVerifierFactory> factories = server.getStreamVerifierFactories();
             for( StreamVerifierFactory f:factories )
             {
                 observers.add( f.newInstance() );

Modified: maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/client/JettyDeployerTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/client/JettyDeployerTest.java?rev=687239&r1=687238&r2=687239&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/client/JettyDeployerTest.java (original)
+++ maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/client/JettyDeployerTest.java Tue Aug 19 21:46:40 2008
@@ -182,7 +182,7 @@
                     , keyId, secretKeyPass
                                         )
                       );
-        remoteServerType.setStreamObserverFactories(factories);
+        remoteServerType.setStreamVerifierFactories(factories);
         
         System.err.println("Basedir = "+_baseDir.getAbsolutePath());
         
@@ -314,7 +314,7 @@
     public void testUploadFail () throws Exception 
     {        
         factories.add(new SHA1VerifierFactory(false, true)); //!lenient, sufficient
-        remoteServerType.setStreamObserverFactories(factories);
+        remoteServerType.setStreamVerifierFactories(factories);
         HashSet<Binding> bindings = new HashSet<Binding>();
         DeployRequestImpl request = new DeployRequestImpl();
 
@@ -388,7 +388,7 @@
     public void testUploadFailFast () throws Exception 
     {
         factories.add(new SHA1VerifierFactory(false, true)); //!lenient, sufficient
-        remoteServerType.setStreamObserverFactories(factories);
+        remoteServerType.setStreamVerifierFactories(factories);
         HashSet<Binding> bindings = new HashSet<Binding>();
         DeployRequestImpl request = new DeployRequestImpl();
 
@@ -446,7 +446,7 @@
     public void testMemoryDeployment () throws Exception
     {
         factories.add(new SHA1VerifierFactory(false, true)); //!lenient, sufficient
-        remoteServerType.setStreamObserverFactories(factories);
+        remoteServerType.setStreamVerifierFactories(factories);
         HashSet<Binding> bindings = new HashSet<Binding>();
         DeployRequestImpl request = new DeployRequestImpl();
 

Modified: maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/client/JettyRetrieverTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/client/JettyRetrieverTest.java?rev=687239&r1=687238&r2=687239&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/client/JettyRetrieverTest.java (original)
+++ maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/client/JettyRetrieverTest.java Tue Aug 19 21:46:40 2008
@@ -164,7 +164,7 @@
     throws Exception
     {
         factories.add( new SHA1VerifierFactory(false, true) ); //!lenient, sufficient
-        remoteServerType.setStreamObserverFactories(factories);
+        remoteServerType.setStreamVerifierFactories(factories);
         
         //make local dir to put stuff in
         dir = mkTempDir();
@@ -223,7 +223,7 @@
                   , getClass().getResourceAsStream( publicKeyFile )
                                       )
                     );
-        remoteServerType.setStreamObserverFactories(factories);
+        remoteServerType.setStreamVerifierFactories(factories);
         
         //make local dir to put stuff in
         dir = mkTempDir();
@@ -252,7 +252,7 @@
         throws Exception
     {
         factories.add(new SHA1VerifierFactory(false, true)); //!lenient, sufficient
-        remoteServerType.setStreamObserverFactories(factories);
+        remoteServerType.setStreamVerifierFactories(factories);
         
         //make local dir to put stuff in
         dir = mkTempDir();
@@ -312,7 +312,7 @@
         throws Exception
     {
         factories.add(new SHA1VerifierFactory(true, true)); //lenient, sufficient
-        remoteServerType.setStreamObserverFactories(factories);
+        remoteServerType.setStreamVerifierFactories(factories);
         
         //make local dir to put stuff in
         dir = mkTempDir();
@@ -366,7 +366,7 @@
     throws Exception
     {
         factories.add(new SHA1VerifierFactory(true, true)); //lenient, sufficient
-        remoteServerType.setStreamObserverFactories(factories);
+        remoteServerType.setStreamVerifierFactories(factories);
         //make local dir to put stuff in
         dir = mkTempDir();
         DefaultRetrievalRequest request = new DefaultRetrievalRequest();
@@ -415,7 +415,7 @@
     public void testValidatorSuccess() throws Exception
     {
         factories.add(new SHA1VerifierFactory(true, true)); //lenient, sufficient
-        remoteServerType.setStreamObserverFactories(factories);
+        remoteServerType.setStreamVerifierFactories(factories);
 
         //make local dir to put stuff in
         dir = mkTempDir();
@@ -469,7 +469,7 @@
     public void testValidatorFailure () throws Exception
     {
         factories.add(new SHA1VerifierFactory(true, true)); //lenient, sufficient
-        remoteServerType.setStreamObserverFactories(factories);
+        remoteServerType.setStreamVerifierFactories(factories);
         
         //make local dir to put stuff in
         dir = mkTempDir();
@@ -523,7 +523,7 @@
     public void testMemoryRetrieval () throws Exception
     {
         factories.add(new SHA1VerifierFactory(true, true)); //lenient, sufficient
-        remoteServerType.setStreamObserverFactories(factories);
+        remoteServerType.setStreamVerifierFactories(factories);
 
         //make local dir to put stuff in
         dir = mkTempDir();

Modified: maven/sandbox/trunk/mercury/mercury-transport/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-transport/pom.xml?rev=687239&r1=687238&r2=687239&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-transport/pom.xml (original)
+++ maven/sandbox/trunk/mercury/mercury-transport/pom.xml Tue Aug 19 21:46:40 2008
@@ -14,6 +14,7 @@
   <modules>
     <module>mercury-transport-api</module>
     <module>mercury-transport-http</module>
+    <module>mercury-transport-file</module>
   </modules>
 
 </project>
\ No newline at end of file

Propchange: maven/sandbox/trunk/mercury/mercury-util/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Aug 19 21:46:40 2008
@@ -0,0 +1,4 @@
+.settings
+target
+.classpath
+.project

Added: maven/sandbox/trunk/mercury/mercury-util/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-util/pom.xml?rev=687239&view=auto
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-util/pom.xml (added)
+++ maven/sandbox/trunk/mercury/mercury-util/pom.xml Tue Aug 19 21:46:40 2008
@@ -0,0 +1,12 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.maven.mercury</groupId>
+    <artifactId>mercury-pom</artifactId>
+    <version>1-SNAPSHOT</version>
+  </parent>
+  <artifactId>mercury-util</artifactId>
+  <version>1.0.0-alpha-1-SNAPSHOT</version>
+  <name>Mercury Shared Utilities:       ${project.version}</name>
+
+</project>
\ No newline at end of file

Modified: maven/sandbox/trunk/mercury/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/pom.xml?rev=687239&r1=687238&r2=687239&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/pom.xml (original)
+++ maven/sandbox/trunk/mercury/pom.xml Tue Aug 19 21:46:40 2008
@@ -15,6 +15,7 @@
     <module>mercury-transport</module>
     <module>mercury-external</module>
     <module>mercury-crypto</module>
+    <module>mercury-util</module>
     <module>mercury-it</module>
   </modules>