You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2006/08/12 06:31:57 UTC

svn commit: r430971 [2/2] - in /maven/repository-manager/trunk: ./ maven-repository-configuration/ maven-repository-configuration/src/main/java/org/apache/maven/repository/configuration/ maven-repository-configuration/src/main/mdo/ maven-repository-con...

Added: maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyRequestHandler.java
URL: http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyRequestHandler.java?rev=430971&view=auto
==============================================================================
--- maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyRequestHandler.java (added)
+++ maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyRequestHandler.java Fri Aug 11 21:31:55 2006
@@ -0,0 +1,507 @@
+package org.apache.maven.repository.proxy;
+
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.manager.ChecksumFailedException;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
+import org.apache.maven.repository.discovery.ArtifactDiscoverer;
+import org.apache.maven.repository.discovery.DiscovererException;
+import org.apache.maven.wagon.ConnectionException;
+import org.apache.maven.wagon.ResourceDoesNotExistException;
+import org.apache.maven.wagon.TransferFailedException;
+import org.apache.maven.wagon.Wagon;
+import org.apache.maven.wagon.authentication.AuthenticationException;
+import org.apache.maven.wagon.authorization.AuthorizationException;
+import org.apache.maven.wagon.observers.ChecksumObserver;
+import org.apache.maven.wagon.proxy.ProxyInfo;
+import org.apache.maven.wagon.repository.Repository;
+import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.codehaus.plexus.util.FileUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.security.NoSuchAlgorithmException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * An implementation of the proxy handler.
+ *
+ * @author <a href="mailto:brett@apache.org">Brett Porter</a>
+ * @plexus.component
+ * @todo this currently duplicates a lot of the wagon manager, and doesn't do things like snapshot resolution, etc.
+ * Should we have a more artifact based one? This will merge metadata so should behave correctly, and it is able to
+ * correct some limitations of the wagon manager (eg, it can retrieve newer SNAPSHOT files without metadata)
+ */
+public class DefaultProxyRequestHandler
+    extends AbstractLogEnabled
+    implements ProxyRequestHandler
+{
+    /**
+     * @plexus.requirement role-hint="default"
+     * @todo use a map, and have priorities in them
+     */
+    private ArtifactDiscoverer defaultArtifactDiscoverer;
+
+    /**
+     * @plexus.requirement role-hint="legacy"
+     */
+    private ArtifactDiscoverer legacyArtifactDiscoverer;
+
+    /**
+     * @plexus.requirement role="org.apache.maven.wagon.Wagon"
+     */
+    private Map/*<String,Wagon>*/ wagons;
+
+    public File get( String path, List proxiedRepositories, ArtifactRepository managedRepository )
+        throws ProxyException, ResourceDoesNotExistException
+    {
+        return get( path, proxiedRepositories, managedRepository, null );
+    }
+
+    public File get( String path, List proxiedRepositories, ArtifactRepository managedRepository, ProxyInfo wagonProxy )
+        throws ProxyException, ResourceDoesNotExistException
+    {
+        //@todo use wagonManager for cache use file:// as URL
+        File cachedFile = new File( managedRepository.getBasedir(), path );
+        if ( !cachedFile.exists() )
+        {
+            cachedFile = getAlways( path, proxiedRepositories, managedRepository, wagonProxy );
+        }
+        return cachedFile;
+    }
+
+
+    public File getAlways( String path, List proxiedRepositories, ArtifactRepository managedRepository )
+        throws ProxyException, ResourceDoesNotExistException
+    {
+        return getAlways( path, proxiedRepositories, managedRepository, null );
+    }
+
+    public File getAlways( String path, List proxiedRepositories, ArtifactRepository managedRepository,
+                           ProxyInfo wagonProxy )
+        throws ProxyException, ResourceDoesNotExistException
+    {
+        File remoteFile = null;
+
+        for ( Iterator i = proxiedRepositories.iterator(); i.hasNext(); )
+        {
+            ProxiedArtifactRepository repository = (ProxiedArtifactRepository) i.next();
+
+            if ( repository.isCachedFailure( path ) )
+            {
+                getLogger().debug( "Skipping repository " + repository.getName() + " for a cached path failure." );
+            }
+            else
+            {
+                if ( path.endsWith( ".md5" ) || path.endsWith( ".sha1" ) )
+                {
+                    // always read from the managed repository
+                    remoteFile = new File( managedRepository.getBasedir(), path );
+                }
+                else if ( path.endsWith( "maven-metadata.xml" ) )
+                {
+                    remoteFile = getFromRepository( path, repository, managedRepository.getBasedir(), wagonProxy,
+                                                    repository.getRepository().getReleases() );
+                }
+                else
+                {
+                    Artifact artifact = null;
+                    try
+                    {
+                        artifact = defaultArtifactDiscoverer.buildArtifact( path );
+                    }
+                    catch ( DiscovererException e )
+                    {
+                        getLogger().debug(
+                            "Failed to build artifact using default layout with message: " + e.getMessage() );
+                    }
+
+                    if ( artifact == null )
+                    {
+                        try
+                        {
+                            artifact = legacyArtifactDiscoverer.buildArtifact( path );
+                        }
+                        catch ( DiscovererException e )
+                        {
+                            getLogger().debug(
+                                "Failed to build artifact using legacy layout with message: " + e.getMessage() );
+                        }
+                    }
+
+                    if ( artifact != null )
+                    {
+                        getArtifact( artifact, repository, managedRepository, wagonProxy );
+
+                        remoteFile = artifact.getFile();
+                    }
+                    else
+                    {
+                        // Some other unknown file in the repository, proxy as is
+                        getFromRepository( path, repository, managedRepository.getBasedir(), wagonProxy, null );
+                    }
+                }
+
+                if ( remoteFile != null && !remoteFile.exists() )
+                {
+                    repository.addFailure( path );
+                    throw new ResourceDoesNotExistException(
+                        "Could not find " + path + " in any of the repositories." );
+                }
+                else
+                {
+                    // in case it previously failed and we've since found it
+                    repository.clearFailure( path );
+                }
+            }
+        }
+
+        return remoteFile;
+    }
+
+    private File getFromRepository( String path, ProxiedArtifactRepository repository, String repositoryCachePath,
+                                    ProxyInfo httpProxy, ArtifactRepositoryPolicy policy )
+        throws ProxyException, ResourceDoesNotExistException
+    {
+        File target = new File( repositoryCachePath, path );
+        if ( !target.exists() || isOutOfDate( policy, target ) )
+        {
+            boolean connected = false;
+            Map checksums = null;
+            Wagon wagon = null;
+
+            try
+            {
+                String protocol = repository.getRepository().getProtocol();
+                wagon = (Wagon) wagons.get( protocol );
+                if ( wagon == null )
+                {
+                    throw new ProxyException( "Unsupported remote protocol: " + protocol );
+                }
+
+                //@todo configure wagon (ssh settings, etc)
+
+                checksums = prepareChecksumListeners( wagon );
+
+                connected = connectToRepository( wagon, repository, httpProxy );
+                if ( connected )
+                {
+                    File temp = new File( target.getAbsolutePath() + ".tmp" );
+                    temp.deleteOnExit();
+
+                    int tries = 0;
+                    boolean success;
+
+                    do
+                    {
+                        tries++;
+
+                        getLogger().info( "Trying " + path + " from " + repository.getName() + "..." );
+
+                        if ( !target.exists() )
+                        {
+                            wagon.get( path, temp );
+                        }
+                        else
+                        {
+                            wagon.getIfNewer( path, temp, target.lastModified() );
+                        }
+
+                        success = doChecksumCheck( checksums, path, wagon, repositoryCachePath );
+
+                        if ( tries > 1 && !success )
+                        {
+                            throw new ProxyException( "Checksum failures occurred while downloading " + path );
+                        }
+                    }
+                    while ( !success );
+
+                    disconnectWagon( wagon );
+
+                    if ( temp.exists() )
+                    {
+                        moveTempToTarget( temp, target );
+                    }
+                }
+                //try next repository
+            }
+            catch ( TransferFailedException e )
+            {
+                String message = "Skipping repository " + repository.getName() + ": " + e.getMessage();
+                processRepositoryFailure( repository, message, e );
+            }
+            catch ( AuthorizationException e )
+            {
+                String message = "Skipping repository " + repository.getName() + ": " + e.getMessage();
+                processRepositoryFailure( repository, message, e );
+            }
+            finally
+            {
+                if ( wagon != null && checksums != null )
+                {
+                    releaseChecksumListeners( wagon, checksums );
+                }
+
+                if ( connected )
+                {
+                    disconnectWagon( wagon );
+                }
+            }
+        }
+        return target;
+    }
+
+    private static boolean isOutOfDate( ArtifactRepositoryPolicy policy, File target )
+    {
+        return policy != null && policy.checkOutOfDate( new Date( target.lastModified() ) );
+    }
+
+    /**
+     * Used to add checksum observers as transfer listeners to the wagonManager object
+     *
+     * @param wagon the wagonManager object to use the checksum with
+     * @return map of ChecksumObservers added into the wagonManager transfer listeners
+     */
+    private Map prepareChecksumListeners( Wagon wagon )
+    {
+        Map checksums = new HashMap();
+        try
+        {
+            ChecksumObserver checksum = new ChecksumObserver( "SHA-1" );
+            wagon.addTransferListener( checksum );
+            checksums.put( "sha1", checksum );
+
+            checksum = new ChecksumObserver( "MD5" );
+            wagon.addTransferListener( checksum );
+            checksums.put( "md5", checksum );
+        }
+        catch ( NoSuchAlgorithmException e )
+        {
+            getLogger().info( "An error occurred while preparing checksum observers", e );
+        }
+        return checksums;
+    }
+
+    private void releaseChecksumListeners( Wagon wagon, Map checksumMap )
+    {
+        for ( Iterator checksums = checksumMap.values().iterator(); checksums.hasNext(); )
+        {
+            ChecksumObserver listener = (ChecksumObserver) checksums.next();
+            wagon.removeTransferListener( listener );
+        }
+    }
+
+    private boolean connectToRepository( Wagon wagon, ProxiedArtifactRepository repository, ProxyInfo httpProxy )
+    {
+        boolean connected = false;
+        try
+        {
+            ArtifactRepository artifactRepository = repository.getRepository();
+            Repository wagonRepository = new Repository( artifactRepository.getId(), artifactRepository.getUrl() );
+            if ( repository.isUseNetworkProxy() && httpProxy != null )
+            {
+                wagon.connect( wagonRepository, httpProxy );
+            }
+            else
+            {
+                wagon.connect( wagonRepository );
+            }
+            connected = true;
+        }
+        catch ( ConnectionException e )
+        {
+            getLogger().info( "Could not connect to " + repository.getName() + ": " + e.getMessage() );
+        }
+        catch ( AuthenticationException e )
+        {
+            getLogger().info( "Could not connect to " + repository.getName() + ": " + e.getMessage() );
+        }
+
+        return connected;
+    }
+
+    private boolean doChecksumCheck( Map checksumMap, String path, Wagon wagon, String repositoryCachePath )
+        throws ProxyException
+    {
+        releaseChecksumListeners( wagon, checksumMap );
+        for ( Iterator checksums = checksumMap.keySet().iterator(); checksums.hasNext(); )
+        {
+            String checksumExt = (String) checksums.next();
+            ChecksumObserver checksum = (ChecksumObserver) checksumMap.get( checksumExt );
+            String checksumPath = path + "." + checksumExt;
+            File checksumFile = new File( repositoryCachePath, checksumPath );
+
+            try
+            {
+                File tempChecksumFile = new File( checksumFile.getAbsolutePath() + ".tmp" );
+
+                wagon.get( checksumPath, tempChecksumFile );
+
+                String remoteChecksum = FileUtils.fileRead( tempChecksumFile ).trim();
+                if ( remoteChecksum.indexOf( ' ' ) > 0 )
+                {
+                    remoteChecksum = remoteChecksum.substring( 0, remoteChecksum.indexOf( ' ' ) );
+                }
+
+                boolean checksumCheck = false;
+                if ( remoteChecksum.toUpperCase().equals( checksum.getActualChecksum().toUpperCase() ) )
+                {
+                    moveTempToTarget( tempChecksumFile, checksumFile );
+
+                    checksumCheck = true;
+                }
+                return checksumCheck;
+            }
+            catch ( ChecksumFailedException e )
+            {
+                return false;
+            }
+            catch ( TransferFailedException e )
+            {
+                getLogger().debug( "An error occurred during the download of " + checksumPath + ": " + e.getMessage(),
+                                   e );
+                // do nothing try the next checksum
+            }
+            catch ( ResourceDoesNotExistException e )
+            {
+                getLogger().debug( "An error occurred during the download of " + checksumPath + ": " + e.getMessage(),
+                                   e );
+                // do nothing try the next checksum
+            }
+            catch ( AuthorizationException e )
+            {
+                getLogger().debug( "An error occurred during the download of " + checksumPath + ": " + e.getMessage(),
+                                   e );
+                // do nothing try the next checksum
+            }
+            catch ( IOException e )
+            {
+                getLogger().debug( "An error occurred while reading the temporary checksum file.", e );
+                return false;
+            }
+        }
+
+        getLogger().debug( "Skipping checksum validation for " + path + ": No remote checksums available." );
+
+        return true;
+    }
+
+    /**
+     * Used to move the temporary file to its real destination.  This is patterned from the way WagonManager handles
+     * its downloaded files.
+     *
+     * @param temp   The completed download file
+     * @param target The final location of the downloaded file
+     * @throws ProxyException when the temp file cannot replace the target file
+     */
+    private void moveTempToTarget( File temp, File target )
+        throws ProxyException
+    {
+        if ( target.exists() && !target.delete() )
+        {
+            throw new ProxyException( "Unable to overwrite existing target file: " + target.getAbsolutePath() );
+        }
+
+        if ( !temp.renameTo( target ) )
+        {
+            getLogger().warn( "Unable to rename tmp file to its final name... resorting to copy command." );
+
+            try
+            {
+                FileUtils.copyFile( temp, target );
+            }
+            catch ( IOException e )
+            {
+                throw new ProxyException( "Cannot copy tmp file to its final location", e );
+            }
+            finally
+            {
+                temp.delete();
+            }
+        }
+    }
+
+    /**
+     * Used to disconnect the wagonManager from its repository
+     *
+     * @param wagon the connected wagonManager object
+     */
+    private void disconnectWagon( Wagon wagon )
+    {
+        try
+        {
+            wagon.disconnect();
+        }
+        catch ( ConnectionException e )
+        {
+            getLogger().error( "Problem disconnecting from wagonManager - ignoring: " + e.getMessage() );
+        }
+    }
+
+    /**
+     * Queries the configuration on how to handle a repository download failure
+     *
+     * @param repository the repository object where the failure occurred
+     * @param message    the message/reason for the failure
+     * @param t          the cause for the exception
+     * @throws ProxyException if hard failure is enabled on the repository causing the failure
+     */
+    private void processRepositoryFailure( ProxiedArtifactRepository repository, String message, Throwable t )
+        throws ProxyException
+    {
+        if ( repository.isHardFail() )
+        {
+            throw new ProxyException(
+                "An error occurred in hardfailing repository " + repository.getName() + "...\n    " + message, t );
+        }
+        else
+        {
+            getLogger().error( message, t );
+        }
+    }
+
+    private void getArtifact( Artifact artifact, ProxiedArtifactRepository repository, ArtifactRepository repoCache,
+                              ProxyInfo httpProxy )
+        throws ProxyException, ResourceDoesNotExistException
+    {
+        ArtifactRepository artifactRepository = repository.getRepository();
+        ArtifactRepositoryPolicy policy =
+            artifact.isSnapshot() ? artifactRepository.getSnapshots() : artifactRepository.getReleases();
+
+        if ( !policy.isEnabled() )
+        {
+            getLogger().debug( "Skipping disabled repository " + repository.getName() );
+        }
+        else
+        {
+            getLogger().debug( "Trying repository " + repository.getName() );
+            // Don't use releases policy, we don't want to perform updates on them (only metadata, as used above)
+            getFromRepository( artifactRepository.pathOf( artifact ), repository, repoCache.getBasedir(), httpProxy,
+                               artifact.isSnapshot() ? artifactRepository.getSnapshots() : null );
+            getLogger().debug( "  Artifact resolved" );
+
+            artifact.setResolved( true );
+        }
+    }
+
+}

Propchange: maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyRequestHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyRequestHandler.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxiedArtifactRepository.java
URL: http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxiedArtifactRepository.java?rev=430971&view=auto
==============================================================================
--- maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxiedArtifactRepository.java (added)
+++ maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxiedArtifactRepository.java Fri Aug 11 21:31:55 2006
@@ -0,0 +1,107 @@
+package org.apache.maven.repository.proxy;
+
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.maven.artifact.repository.ArtifactRepository;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * A proxied artifact repository - contains the artifact repository and additional information about
+ * the proxied repository.
+ *
+ * @author <a href="mailto:brett@apache.org">Brett Porter</a>
+ */
+public class ProxiedArtifactRepository
+{
+    /**
+     * Whether to cache failures or not.
+     */
+    private boolean cacheFailures;
+
+    /**
+     * Whether failures on this repository cause the whole group to fail.
+     */
+    private boolean hardFail;
+
+    /**
+     * Whether to use the network proxy for any requests.
+     */
+    private boolean useNetworkProxy;
+
+    /**
+     * The artifact repository on the other end of the proxy.
+     */
+    private ArtifactRepository repository;
+
+    /**
+     * Cache of failures that have already occurred, containing paths from the repository root.
+     */
+    private Set/*<String>*/ failureCache = new HashSet/*<String>*/();
+
+    /**
+     * A user friendly name for the repository.
+     */
+    private String name;
+
+    public boolean isHardFail()
+    {
+        return hardFail;
+    }
+
+    public boolean isUseNetworkProxy()
+    {
+        return useNetworkProxy;
+    }
+
+    public boolean isCacheFailures()
+    {
+        return cacheFailures;
+    }
+
+    public ArtifactRepository getRepository()
+    {
+        return repository;
+    }
+
+    public boolean isCachedFailure( String path )
+    {
+        return cacheFailures && failureCache.contains( path );
+    }
+
+    public void addFailure( String path )
+    {
+        if ( cacheFailures )
+        {
+            failureCache.add( path );
+        }
+    }
+
+    public void clearFailure( String path )
+    {
+        if ( cacheFailures )
+        {
+            failureCache.remove( path );
+        }
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+}

Propchange: maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxiedArtifactRepository.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxiedArtifactRepository.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxyRequestHandler.java
URL: http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxyRequestHandler.java?rev=430971&view=auto
==============================================================================
--- maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxyRequestHandler.java (added)
+++ maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxyRequestHandler.java Fri Aug 11 21:31:55 2006
@@ -0,0 +1,101 @@
+package org.apache.maven.repository.proxy;
+
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.wagon.ResourceDoesNotExistException;
+import org.apache.maven.wagon.proxy.ProxyInfo;
+
+import java.io.File;
+import java.util.List;
+
+/**
+ * An individual request handler for the proxy.
+ *
+ * @author <a href="mailto:brett@apache.org">Brett Porter</a>
+ */
+public interface ProxyRequestHandler
+{
+    /**
+     * The Plexus role of the component.
+     */
+    String ROLE = ProxyRequestHandler.class.getName();
+
+    /**
+     * Used to retrieve an artifact at a particular path, giving the cached version if it exists.
+     *
+     * @param path                the expected repository path
+     * @param proxiedRepositories the repositories being proxied to
+     * @param managedRepository   the locally managed repository to cache artifacts in
+     * @return File object referencing the requested path in the cache
+     * @throws ProxyException when an exception occurred during the retrieval of the requested path
+     * @throws org.apache.maven.wagon.ResourceDoesNotExistException
+     *                        when the requested object can't be found in any of the
+     *                        configured repositories
+     */
+    File get( String path, List proxiedRepositories, ArtifactRepository managedRepository )
+        throws ProxyException, ResourceDoesNotExistException;
+
+    /**
+     * Used to retrieve an artifact at a particular path, giving the cached version if it exists.
+     *
+     * @param path                the expected repository path
+     * @param proxiedRepositories the repositories being proxied to
+     * @param managedRepository   the locally managed repository to cache artifacts in
+     * @param wagonProxy          a network proxy to use when transferring files if needed
+     * @return File object referencing the requested path in the cache
+     * @throws ProxyException when an exception occurred during the retrieval of the requested path
+     * @throws org.apache.maven.wagon.ResourceDoesNotExistException
+     *                        when the requested object can't be found in any of the
+     *                        configured repositories
+     */
+    File get( String path, List proxiedRepositories, ArtifactRepository managedRepository, ProxyInfo wagonProxy )
+        throws ProxyException, ResourceDoesNotExistException;
+
+    /**
+     * Used to force remote download of the requested path from any the configured repositories.  This method will
+     * only bypass the cache for searching but the requested path will still be cached.
+     *
+     * @param path                the expected repository path
+     * @param proxiedRepositories the repositories being proxied to
+     * @param managedRepository   the locally managed repository to cache artifacts in
+     * @return File object referencing the requested path in the cache
+     * @throws ProxyException when an exception occurred during the retrieval of the requested path
+     * @throws org.apache.maven.wagon.ResourceDoesNotExistException
+     *                        when the requested object can't be found in any of the
+     *                        configured repositories
+     */
+    File getAlways( String path, List proxiedRepositories, ArtifactRepository managedRepository )
+        throws ProxyException, ResourceDoesNotExistException;
+
+    /**
+     * Used to force remote download of the requested path from any the configured repositories.  This method will
+     * only bypass the cache for searching but the requested path will still be cached.
+     *
+     * @param path                the expected repository path
+     * @param proxiedRepositories the repositories being proxied to
+     * @param managedRepository   the locally managed repository to cache artifacts in
+     * @param wagonProxy          a network proxy to use when transferring files if needed
+     * @return File object referencing the requested path in the cache
+     * @throws ProxyException when an exception occurred during the retrieval of the requested path
+     * @throws org.apache.maven.wagon.ResourceDoesNotExistException
+     *                        when the requested object can't be found in any of the
+     *                        configured repositories
+     */
+    File getAlways( String path, List proxiedRepositories, ArtifactRepository managedRepository, ProxyInfo wagonProxy )
+        throws ProxyException, ResourceDoesNotExistException;
+}

Propchange: maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxyRequestHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxyRequestHandler.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: maven/repository-manager/trunk/maven-repository-proxy/src/test/java/org/apache/maven/repository/proxy/ProxyRequestHandlerTest.java (from r430652, maven/repository-manager/trunk/maven-repository-proxy/src/test/java/org/apache/maven/repository/proxy/DefaultProxyManagerTest.java)
URL: http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-proxy/src/test/java/org/apache/maven/repository/proxy/ProxyRequestHandlerTest.java?p2=maven/repository-manager/trunk/maven-repository-proxy/src/test/java/org/apache/maven/repository/proxy/ProxyRequestHandlerTest.java&p1=maven/repository-manager/trunk/maven-repository-proxy/src/test/java/org/apache/maven/repository/proxy/DefaultProxyManagerTest.java&r1=430652&r2=430971&rev=430971&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-proxy/src/test/java/org/apache/maven/repository/proxy/DefaultProxyManagerTest.java (original)
+++ maven/repository-manager/trunk/maven-repository-proxy/src/test/java/org/apache/maven/repository/proxy/ProxyRequestHandlerTest.java Fri Aug 11 21:31:55 2006
@@ -16,71 +16,46 @@
  * limitations under the License.
  */
 
-import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
-import org.apache.maven.repository.proxy.configuration.ProxyConfiguration;
-import org.apache.maven.repository.proxy.repository.ProxyRepository;
 import org.apache.maven.wagon.ResourceDoesNotExistException;
 import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 
 import java.io.File;
 
 /**
  * @author Edwin Punzalan
  */
-public class DefaultProxyManagerTest
+public class ProxyRequestHandlerTest
     extends PlexusTestCase
 {
-    private ProxyManager proxy;
+    private ProxyRequestHandler requestHandler;
 
-    private ProxyConfiguration configuration;
+    public void testdummy(){}
 
+/* TODO!
     protected void setUp()
         throws Exception
     {
         super.setUp();
 
-        proxy = (ProxyManager) container.lookup( ProxyManager.ROLE );
-
-        configuration = getProxyConfiguration();
-        proxy.setConfiguration( configuration );
-    }
-
-    public void testExceptions()
-    {
-        proxy.setConfiguration( null );
-
-        try
-        {
-            proxy.get( "/invalid" );
-            fail( "Expected empty configuration error." );
-        }
-        catch ( ProxyException e )
-        {
-            assertEquals( "Expected Exception not thrown.", "No proxy configuration defined.", e.getMessage() );
-        }
-        catch ( ResourceDoesNotExistException e )
-        {
-            fail( "Expected Exception not thrown." );
-        }
+        requestHandler = (ProxyRequestHandler) container.lookup( ProxyRequestHandler.ROLE );
     }
 
     public void testArtifactDownload()
         throws Exception
     {
         //test download
-        File file = proxy.get( "/commons-logging/commons-logging/1.0/commons-logging-1.0.jar" );
+        String s = "/commons-logging/commons-logging/1.0/commons-logging-1.0.jar";
+        File file = get( s );
         assertTrue( "File must be downloaded.", file.exists() );
         assertTrue( "Downloaded file should be present in the cache.",
-                    file.getAbsolutePath().startsWith( configuration.getRepositoryCachePath() ) );
+                    file.getAbsolutePath().startsWith( managedRepository.getBasedir() ) );
 
         //test cache
-        proxy.get( "/commons-logging/commons-logging/1.0/commons-logging-1.0.jar" );
+        get( "/commons-logging/commons-logging/1.0/commons-logging-1.0.jar" );
 
         try
         {
-            proxy.get( "/commons-logging/commons-logging/2.0/commons-logging-2.0.jar" );
+            get( "/commons-logging/commons-logging/2.0/commons-logging-2.0.jar" );
             fail( "Expected ResourceDoesNotExistException exception not thrown" );
         }
         catch ( ResourceDoesNotExistException e )
@@ -89,49 +64,47 @@
         }
     }
 
+    private File get( String s )
+        throws ProxyException, ResourceDoesNotExistException
+    {
+        return requestHandler.get( s, proxiedRepositories, managedRepository );
+    }
+
     public void testArtifactChecksum()
         throws Exception
     {
         //force the downlod from the remote repository, use getAlways()
-        File file = proxy.getAlways( "/commons-logging/commons-logging/1.0/commons-logging-1.0.jar.md5" );
+        File file = requestHandler.getAlways( "/commons-logging/commons-logging/1.0/commons-logging-1.0.jar.md5" );
         assertTrue( "File must be downloaded.", file.exists() );
         assertTrue( "Downloaded file should be present in the cache.",
-                    file.getAbsolutePath().startsWith( configuration.getRepositoryCachePath() ) );
+                    file.getAbsolutePath().startsWith( managedRepository.getBasedir() ) );
     }
 
     public void testNonArtifactWithNoChecksum()
         throws Exception
     {
-        File file = proxy.get( "/not-standard/repository/file.txt" );
+        File file = get( "/not-standard/repository/file.txt" );
         assertTrue( "File must be downloaded.", file.exists() );
         assertTrue( "Downloaded file should be present in the cache.",
-                    file.getAbsolutePath().startsWith( configuration.getRepositoryCachePath() ) );
+                    file.getAbsolutePath().startsWith( managedRepository.getBasedir() ) );
     }
 
     public void testNonArtifactWithMD5Checksum()
         throws Exception
     {
-        File file = proxy.get( "/checksumed-md5/repository/file.txt" );
+        File file = get( "/checksumed-md5/repository/file.txt" );
         assertTrue( "File must be downloaded.", file.exists() );
         assertTrue( "Downloaded file should be present in the cache.",
-                    file.getAbsolutePath().startsWith( configuration.getRepositoryCachePath() ) );
+                    file.getAbsolutePath().startsWith( managedRepository.getBasedir() ) );
     }
 
     public void testNonArtifactWithSHA1Checksum()
         throws Exception
     {
-        File file = proxy.get( "/checksumed-sha1/repository/file.txt" );
+        File file = get( "/checksumed-sha1/repository/file.txt" );
         assertTrue( "File must be downloaded.", file.exists() );
         assertTrue( "Downloaded file should be present in the cache.",
-                    file.getAbsolutePath().startsWith( configuration.getRepositoryCachePath() ) );
-    }
-
-    protected void tearDown()
-        throws Exception
-    {
-        container.release( proxy );
-
-        super.tearDown();
+                    file.getAbsolutePath().startsWith( managedRepository.getBasedir() ) );
     }
 
     private ProxyConfiguration getProxyConfiguration()
@@ -139,7 +112,7 @@
     {
         ProxyConfiguration config = new ProxyConfiguration();
 
-        config.setRepositoryCachePath( "target/proxy-cache" );
+        config.setRepositoryCachePath( "target/requestHandler-cache" );
 
         ArtifactRepositoryLayout defLayout = new DefaultRepositoryLayout();
 
@@ -151,4 +124,5 @@
 
         return config;
     }
+*/
 }

Modified: maven/repository-manager/trunk/maven-repository-webapp/pom.xml
URL: http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-webapp/pom.xml?rev=430971&r1=430970&r2=430971&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-webapp/pom.xml (original)
+++ maven/repository-manager/trunk/maven-repository-webapp/pom.xml Fri Aug 11 21:31:55 2006
@@ -103,14 +103,6 @@
     <finalName>maven-repository-webapp</finalName>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <!-- TODO! temporary until tests are fixed -->
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-      <plugin>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>maven-jetty-plugin</artifactId>
         <configuration>
@@ -145,17 +137,6 @@
                 </artifactItem>
               </artifactItems>
             </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>clean</goal>
-            </goals>
           </execution>
         </executions>
       </plugin>

Modified: maven/repository-manager/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/repository-manager/trunk/pom.xml?rev=430971&r1=430970&r2=430971&view=diff
==============================================================================
--- maven/repository-manager/trunk/pom.xml (original)
+++ maven/repository-manager/trunk/pom.xml Fri Aug 11 21:31:55 2006
@@ -293,7 +293,7 @@
   </reporting>
   <profiles>
     <profile>
-      <id>ciProfile</id>
+      <id>ci</id>
       <activation>
         <property>
           <name>enableCiProfile</name>