You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ah...@apache.org on 2007/05/11 00:30:39 UTC
svn commit: r537022 [1/2] - in /maven/archiva/branches/archiva-0.9:
archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/
archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/
archiva-webapp/src/main/java/org/apache/maven/archiva/web/reposi...
Author: aheritier
Date: Thu May 10 15:30:38 2007
New Revision: 537022
URL: http://svn.apache.org/viewvc?view=rev&rev=537022
Log:
MRM-153 : when used as a maven1 proxy, Archiva should handle relocation from maven2 poms
Added:
maven/archiva/branches/archiva-0.9/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/ProxiedArtifact.java (with props)
Modified:
maven/archiva/branches/archiva-0.9/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java
maven/archiva/branches/archiva-0.9/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/ProxyRequestHandler.java
maven/archiva/branches/archiva-0.9/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/ProxyRequestHandlerTest.java
maven/archiva/branches/archiva-0.9/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java
Modified: maven/archiva/branches/archiva-0.9/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-0.9/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java?view=diff&rev=537022&r1=537021&r2=537022
==============================================================================
--- maven/archiva/branches/archiva-0.9/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java (original)
+++ maven/archiva/branches/archiva-0.9/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java Thu May 10 15:30:38 2007
@@ -104,32 +104,32 @@
private static final TimeZone UTC_TIMEZONE = TimeZone.getTimeZone( "UTC" );
- public File get( String path, List proxiedRepositories, ArtifactRepository managedRepository )
+ public ProxiedArtifact 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 )
+ public ProxiedArtifact get( String path, List proxiedRepositories, ArtifactRepository managedRepository, ProxyInfo wagonProxy )
throws ProxyException, ResourceDoesNotExistException
{
return get( managedRepository, path, proxiedRepositories, wagonProxy, false );
}
- public File getAlways( String path, List proxiedRepositories, ArtifactRepository managedRepository )
+ public ProxiedArtifact 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,
+ public ProxiedArtifact getAlways( String path, List proxiedRepositories, ArtifactRepository managedRepository,
ProxyInfo wagonProxy )
throws ResourceDoesNotExistException, ProxyException
{
return get( managedRepository, path, proxiedRepositories, wagonProxy, true );
}
- private File get( ArtifactRepository managedRepository, String path, List proxiedRepositories, ProxyInfo wagonProxy,
+ private ProxiedArtifact get( ArtifactRepository managedRepository, String path, List proxiedRepositories, ProxyInfo wagonProxy,
boolean force )
throws ProxyException, ResourceDoesNotExistException
{
@@ -173,6 +173,10 @@
{
artifact = legacyArtifactBuilder.build( artifactPath );
getLogger().debug( "Artifact requested is: " + artifact );
+
+ // This is a maven1 request (legacy format)
+ // as Maven1 can't handle relocation, do it internally.
+ applyRelocation( managedRepository, artifact, proxiedRepositories, wagonProxy, force );
}
catch ( BuilderException e )
{
@@ -182,12 +186,11 @@
if ( artifact != null )
{
- applyRelocation( managedRepository, artifact, proxiedRepositories, wagonProxy, force );
-
if ( !checksum )
{
+ path = managedRepository.pathOf( artifact );
// Build the target file name
- target = new File( managedRepository.getBasedir(), managedRepository.pathOf( artifact ) );
+ target = new File( managedRepository.getBasedir(), path );
// Get the requested artifact from proxiedRepositories
getArtifactFromRepository( managedRepository, target, artifact, proxiedRepositories, wagonProxy,
@@ -195,9 +198,9 @@
}
else
{
+ path = managedRepository.pathOf( artifact ) + "." + checksumExtension;
// Just adjust the filename for relocation, don't actualy get it
- target = new File( managedRepository.getBasedir(),
- managedRepository.pathOf( artifact ) + "." + checksumExtension );
+ target = new File( managedRepository.getBasedir(), path );
}
}
else if ( !checksum )
@@ -215,7 +218,7 @@
throw new ResourceDoesNotExistException( "Could not find " + path + " in any of the repositories." );
}
- return target;
+ return new ProxiedArtifact( target, path );
}
private void getFileFromRepository( ArtifactRepository managedRepository, File target, String path,
Added: maven/archiva/branches/archiva-0.9/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/ProxiedArtifact.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-0.9/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/ProxiedArtifact.java?view=auto&rev=537022
==============================================================================
--- maven/archiva/branches/archiva-0.9/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/ProxiedArtifact.java (added)
+++ maven/archiva/branches/archiva-0.9/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/ProxiedArtifact.java Thu May 10 15:30:38 2007
@@ -0,0 +1,67 @@
+package org.apache.maven.archiva.proxy;
+
+import java.io.File;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+/**
+ * Composite object for describing an artifact as result of a proxy-request.
+ *
+ * @author @author <a href="mailto:nicolas.deloof@gmail.com">Nicolas De Loof</a>
+ */
+public class ProxiedArtifact
+{
+ /**
+ * The artifact as a file in the managed repository
+ */
+ private File file;
+
+ /**
+ * The artifact Path in the managed repository
+ */
+ private String path;
+
+
+ /**
+ * Constructor
+ */
+ public ProxiedArtifact( File file, String path )
+ {
+ super();
+ this.file = file;
+ this.path = path;
+ }
+
+ /**
+ * @return the file
+ */
+ public File getFile()
+ {
+ return file;
+ }
+
+ /**
+ * @return the path
+ */
+ public String getPath()
+ {
+ return path;
+ }
+}
Propchange: maven/archiva/branches/archiva-0.9/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/ProxiedArtifact.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/archiva/branches/archiva-0.9/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/ProxiedArtifact.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/archiva/branches/archiva-0.9/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/ProxyRequestHandler.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-0.9/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/ProxyRequestHandler.java?view=diff&rev=537022&r1=537021&r2=537022
==============================================================================
--- maven/archiva/branches/archiva-0.9/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/ProxyRequestHandler.java (original)
+++ maven/archiva/branches/archiva-0.9/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/ProxyRequestHandler.java Thu May 10 15:30:38 2007
@@ -23,7 +23,6 @@
import org.apache.maven.wagon.ResourceDoesNotExistException;
import org.apache.maven.wagon.proxy.ProxyInfo;
-import java.io.File;
import java.util.List;
/**
@@ -50,7 +49,7 @@
* when the requested object can't be found in any of the
* configured repositories
*/
- File get( String path, List proxiedRepositories, ArtifactRepository managedRepository )
+ ProxiedArtifact get( String path, List proxiedRepositories, ArtifactRepository managedRepository )
throws ProxyException, ResourceDoesNotExistException;
/**
@@ -66,7 +65,7 @@
* when the requested object can't be found in any of the
* configured repositories
*/
- File get( String path, List proxiedRepositories, ArtifactRepository managedRepository, ProxyInfo wagonProxy )
+ ProxiedArtifact get( String path, List proxiedRepositories, ArtifactRepository managedRepository, ProxyInfo wagonProxy )
throws ProxyException, ResourceDoesNotExistException;
/**
@@ -82,7 +81,7 @@
* when the requested object can't be found in any of the
* configured repositories
*/
- File getAlways( String path, List proxiedRepositories, ArtifactRepository managedRepository )
+ ProxiedArtifact getAlways( String path, List proxiedRepositories, ArtifactRepository managedRepository )
throws ProxyException, ResourceDoesNotExistException;
/**
@@ -99,6 +98,6 @@
* when the requested object can't be found in any of the
* configured repositories
*/
- File getAlways( String path, List proxiedRepositories, ArtifactRepository managedRepository, ProxyInfo wagonProxy )
+ ProxiedArtifact getAlways( String path, List proxiedRepositories, ArtifactRepository managedRepository, ProxyInfo wagonProxy )
throws ProxyException, ResourceDoesNotExistException;
}
Modified: maven/archiva/branches/archiva-0.9/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/ProxyRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-0.9/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/ProxyRequestHandlerTest.java?view=diff&rev=537022&r1=537021&r2=537022
==============================================================================
--- maven/archiva/branches/archiva-0.9/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/ProxyRequestHandlerTest.java (original)
+++ maven/archiva/branches/archiva-0.9/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/ProxyRequestHandlerTest.java Thu May 10 15:30:38 2007
@@ -150,15 +150,15 @@
expectedFile.delete();
assertFalse( expectedFile.exists() );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
File proxiedFile = new File( proxiedRepository1.getBasedir(), path );
String expectedContents = FileUtils.readFileToString( proxiedFile, null );
- assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( file, null ) );
+ assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
// TODO: timestamp preservation requires support for that in wagon
-// assertEquals( "Check file timestamp", proxiedFile.lastModified(), file.lastModified() );
+// assertEquals( "Check file timestamp", proxiedFile.lastModified(), proxied.getFile().lastModified() );
}
public void testGetDefaultLayoutAlreadyPresent()
@@ -171,17 +171,17 @@
assertTrue( expectedFile.exists() );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
- assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( file, null ) );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
+ assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
File proxiedFile = new File( proxiedRepository1.getBasedir(), path );
String unexpectedContents = FileUtils.readFileToString( proxiedFile, null );
- assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( file, null ) ) );
- assertFalse( "Check file timestamp is not that of proxy", proxiedFile.lastModified() == file.lastModified() );
+ assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( proxied.getFile(), null ) ) );
+ assertFalse( "Check file timestamp is not that of proxy", proxiedFile.lastModified() == proxied.getFile().lastModified() );
assertEquals( "Check file timestamp is that of original managed file", originalModificationTime,
- file.lastModified() );
+ proxied.getFile().lastModified() );
}
public void testGetDefaultLayoutRemoteUpdate()
@@ -195,14 +195,14 @@
expectedFile.setLastModified( getPastDate().getTime() );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
- assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( file, null ) );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
+ assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
File proxiedFile = new File( proxiedRepository1.getBasedir(), path );
String unexpectedContents = FileUtils.readFileToString( proxiedFile, null );
- assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( file, null ) ) );
+ assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( proxied.getFile(), null ) ) );
}
public void testGetWhenInBothProxiedRepos()
@@ -214,18 +214,18 @@
expectedFile.delete();
assertFalse( expectedFile.exists() );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
File proxiedFile = new File( proxiedRepository1.getBasedir(), path );
String expectedContents = FileUtils.readFileToString( proxiedFile, null );
- assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( file, null ) );
+ assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
proxiedFile = new File( proxiedRepository2.getBasedir(), path );
String unexpectedContents = FileUtils.readFileToString( proxiedFile, null );
- assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( file, null ) ) );
+ assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( proxied.getFile(), null ) ) );
}
public void testGetInSecondProxiedRepo()
@@ -237,13 +237,13 @@
expectedFile.delete();
assertFalse( expectedFile.exists() );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
File proxiedFile = new File( proxiedRepository2.getBasedir(), path );
String expectedContents = FileUtils.readFileToString( proxiedFile, null );
- assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( file, null ) );
+ assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
}
public void testNotFoundInAnyProxies()
@@ -256,8 +256,8 @@
try
{
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- fail( "File returned was: " + file + "; should have got a not found exception" );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ fail( "File returned was: " + proxied.getFile() + "; should have got a not found exception" );
}
catch ( ResourceDoesNotExistException e )
{
@@ -286,15 +286,15 @@
wagonMockControl.replay();
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
wagonMockControl.verify();
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
File proxiedFile = new File( proxiedRepository2.getBasedir(), path );
String expectedContents = FileUtils.readFileToString( proxiedFile, null );
- assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( file, null ) );
+ assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
assertTrue( "Check failure", proxiedArtifactRepository.isCachedFailure( path ) );
}
@@ -327,8 +327,8 @@
try
{
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- fail( "Found file: " + file + "; but was expecting a failure" );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ fail( "Found file: " + proxied.getFile() + "; but was expecting a failure" );
}
catch ( ResourceDoesNotExistException e )
{
@@ -338,7 +338,7 @@
assertTrue( "Check failure", proxiedArtifactRepository2.isCachedFailure( path ) );
// TODO: do not want failures to present as a not found!
- // TODO: How much information on each failure should we pass back to the user vs. logging in the proxy?
+ // TODO: How much information on each failure should we pass back to the user vs. logging in the proxy?
}
}
@@ -366,8 +366,8 @@
try
{
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- fail( "Found file: " + file + "; but was expecting a failure" );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ fail( "Found file: " + proxied.getFile() + "; but was expecting a failure" );
}
catch ( ProxyException e )
{
@@ -396,18 +396,18 @@
proxiedArtifactRepository.addFailure( path, DEFAULT_POLICY );
proxiedRepositories.add( proxiedArtifactRepository );
proxiedRepositories.add( createProxiedRepository( proxiedRepository2 ) );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
File proxiedFile = new File( proxiedRepository2.getBasedir(), path );
String expectedContents = FileUtils.readFileToString( proxiedFile, null );
- assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( file, null ) );
+ assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
proxiedFile = new File( proxiedRepository1.getBasedir(), path );
String unexpectedContents = FileUtils.readFileToString( proxiedFile, null );
- assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( file, null ) ) );
+ assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( proxied.getFile(), null ) ) );
}
public void testGetInSecondProxiedRepoFirstHardFailsFromCache()
@@ -429,8 +429,8 @@
proxiedRepositories.add( createProxiedRepository( proxiedRepository2 ) );
try
{
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- fail( "Found file: " + file + "; but was expecting a failure" );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ fail( "Found file: " + proxied.getFile() + "; but was expecting a failure" );
}
catch ( ProxyException e )
{
@@ -461,15 +461,15 @@
wagonMockControl.replay();
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
wagonMockControl.verify();
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
File proxiedFile = new File( proxiedRepository2.getBasedir(), path );
String expectedContents = FileUtils.readFileToString( proxiedFile, null );
- assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( file, null ) );
+ assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
assertFalse( "Check failure", proxiedArtifactRepository.isCachedFailure( path ) );
}
@@ -487,18 +487,18 @@
proxiedArtifactRepository.addFailure( path, ALWAYS_UPDATE_POLICY );
proxiedRepositories.add( proxiedArtifactRepository );
proxiedRepositories.add( createProxiedRepository( proxiedRepository2 ) );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
File proxiedFile = new File( proxiedRepository1.getBasedir(), path );
String expectedContents = FileUtils.readFileToString( proxiedFile, null );
- assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( file, null ) );
+ assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
proxiedFile = new File( proxiedRepository2.getBasedir(), path );
String unexpectedContents = FileUtils.readFileToString( proxiedFile, null );
- assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( file, null ) ) );
+ assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( proxied.getFile(), null ) ) );
assertFalse( "Check failure", proxiedArtifactRepository.isCachedFailure( path ) );
}
@@ -512,14 +512,14 @@
assertTrue( expectedFile.exists() );
- File file = requestHandler.getAlways( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.getAlways( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
File proxiedFile = new File( proxiedRepository1.getBasedir(), path );
String expectedContents = FileUtils.readFileToString( proxiedFile, null );
- assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( file, null ) );
- assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( file, null ) ) );
+ assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
+ assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( proxied.getFile(), null ) ) );
}
public void testGetAlwaysAlreadyPresentRemovedFromProxies()
@@ -531,11 +531,11 @@
assertTrue( expectedFile.exists() );
- File file = requestHandler.getAlways( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.getAlways( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
- assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( file, null ) );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
+ assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
}
public void testGetAlwaysWithCachedFailure()
@@ -552,14 +552,14 @@
proxiedArtifactRepository.addFailure( path, DEFAULT_POLICY );
proxiedRepositories.add( proxiedArtifactRepository );
proxiedRepositories.add( createProxiedRepository( proxiedRepository2 ) );
- File file = requestHandler.getAlways( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.getAlways( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
File proxiedFile = new File( proxiedRepository1.getBasedir(), path );
String expectedContents = FileUtils.readFileToString( proxiedFile, null );
- assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( file, null ) );
- assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( file, null ) ) );
+ assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
+ assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( proxied.getFile(), null ) ) );
}
public void testGetRemovesTemporaryFileOnSuccess()
@@ -571,11 +571,11 @@
expectedFile.delete();
assertFalse( expectedFile.exists() );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
- File tempFile = new File( file.getParentFile(), file.getName() + ".tmp" );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
+ File tempFile = new File( proxied.getFile().getParentFile(), proxied.getFile().getName() + ".tmp" );
assertFalse( "Check temporary file removed", tempFile.exists() );
}
@@ -601,8 +601,8 @@
try
{
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- fail( "Found file: " + file + "; but was expecting a failure" );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ fail( "Found file: " + proxied.getFile() + "; but was expecting a failure" );
}
catch ( ResourceDoesNotExistException e )
{
@@ -622,11 +622,11 @@
assertFalse( expectedFile.exists() );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
- File tempFile = new File( file.getParentFile(), file.getName() + ".sha1.tmp" );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
+ File tempFile = new File( proxied.getFile().getParentFile(), proxied.getFile().getName() + ".sha1.tmp" );
assertFalse( "Check temporary file removed", tempFile.exists() );
}
@@ -653,8 +653,8 @@
try
{
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- fail( "Found file: " + file + "; but was expecting a failure" );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ fail( "Found file: " + proxied.getFile() + "; but was expecting a failure" );
}
catch ( ResourceDoesNotExistException e )
{
@@ -678,17 +678,17 @@
FileUtils.deleteDirectory( expectedFile.getParentFile() );
assertFalse( expectedFile.exists() );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
- File checksumFile = getChecksumFile( file, "sha1" );
+ File checksumFile = getChecksumFile( proxied.getFile(), "sha1" );
assertTrue( "Check file created", checksumFile.exists() );
assertEquals( "Check checksum", "066d76e459f7782c312c31e8a11b3c0f1e3e43a7 *get-checksum-both-right-1.0.jar",
FileUtils.readFileToString( checksumFile, null ).trim() );
- assertFalse( "Check file not created", getChecksumFile( file, "md5" ).exists() );
+ assertFalse( "Check file not created", getChecksumFile( proxied.getFile(), "md5" ).exists() );
}
public void testGetCorrectSha1NoMd5()
@@ -700,17 +700,17 @@
FileUtils.deleteDirectory( expectedFile.getParentFile() );
assertFalse( expectedFile.exists() );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
- File checksumFile = getChecksumFile( file, "sha1" );
+ File checksumFile = getChecksumFile( proxied.getFile(), "sha1" );
assertTrue( "Check file created", checksumFile.exists() );
assertEquals( "Check checksum", "748a3a013bf5eacf2bbb40a2ac7d37889b728837 *get-checksum-sha1-only-1.0.jar",
FileUtils.readFileToString( checksumFile, null ).trim() );
- assertFalse( "Check file not created", getChecksumFile( file, "md5" ).exists() );
+ assertFalse( "Check file not created", getChecksumFile( proxied.getFile(), "md5" ).exists() );
}
public void testGetCorrectSha1BadMd5()
@@ -722,17 +722,17 @@
FileUtils.deleteDirectory( expectedFile.getParentFile() );
assertFalse( expectedFile.exists() );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
- File checksumFile = getChecksumFile( file, "sha1" );
+ File checksumFile = getChecksumFile( proxied.getFile(), "sha1" );
assertTrue( "Check file created", checksumFile.exists() );
assertEquals( "Check checksum", "3dd1a3a57b807d3ef3fbc6013d926c891cbb8670 *get-checksum-sha1-bad-md5-1.0.jar",
FileUtils.readFileToString( checksumFile, null ).trim() );
- assertFalse( "Check file not created", getChecksumFile( file, "md5" ).exists() );
+ assertFalse( "Check file not created", getChecksumFile( proxied.getFile(), "md5" ).exists() );
}
public void testGetCorrectMd5NoSha1()
@@ -744,17 +744,17 @@
FileUtils.deleteDirectory( expectedFile.getParentFile() );
assertFalse( expectedFile.exists() );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
- File checksumFile = getChecksumFile( file, "md5" );
+ File checksumFile = getChecksumFile( proxied.getFile(), "md5" );
assertTrue( "Check file created", checksumFile.exists() );
assertEquals( "Check checksum", "f3af5201bf8da801da37db8842846e1c *get-checksum-md5-only-1.0.jar",
FileUtils.readFileToString( checksumFile, null ).trim() );
- assertFalse( "Check file not created", getChecksumFile( file, "sha1" ).exists() );
+ assertFalse( "Check file not created", getChecksumFile( proxied.getFile(), "sha1" ).exists() );
}
public void testGetCorrectMd5BadSha1()
@@ -766,17 +766,17 @@
FileUtils.deleteDirectory( expectedFile.getParentFile() );
assertFalse( expectedFile.exists() );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
- File checksumFile = getChecksumFile( file, "md5" );
+ File checksumFile = getChecksumFile( proxied.getFile(), "md5" );
assertTrue( "Check file created", checksumFile.exists() );
assertEquals( "Check checksum", "8a02aa67549d27b2a03cd4547439c6d3 *get-checksum-md5-bad-sha1-1.0.jar",
FileUtils.readFileToString( checksumFile, null ).trim() );
- assertFalse( "Check file not created", getChecksumFile( file, "sha1" ).exists() );
+ assertFalse( "Check file not created", getChecksumFile( proxied.getFile(), "sha1" ).exists() );
}
public void testGetWithNoChecksums()
@@ -788,13 +788,13 @@
expectedFile.delete();
assertFalse( expectedFile.exists() );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
- assertFalse( "Check file not created", getChecksumFile( file, "md5" ).exists() );
- assertFalse( "Check file not created", getChecksumFile( file, "sha1" ).exists() );
+ assertFalse( "Check file not created", getChecksumFile( proxied.getFile(), "md5" ).exists() );
+ assertFalse( "Check file not created", getChecksumFile( proxied.getFile(), "sha1" ).exists() );
}
public void testGetBadMd5BadSha1()
@@ -808,8 +808,8 @@
try
{
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- fail( "Found file: " + file + "; but was expecting a failure" );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ fail( "Found file: " + proxied.getFile() + "; but was expecting a failure" );
}
catch ( ResourceDoesNotExistException e )
{
@@ -844,8 +844,8 @@
try
{
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- fail( "Found file: " + file + "; but was expecting a failure" );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ fail( "Found file: " + proxied.getFile() + "; but was expecting a failure" );
}
catch ( ResourceDoesNotExistException e )
{
@@ -868,17 +868,17 @@
assertTrue( expectedFile.exists() );
- File file = requestHandler.getAlways( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.getAlways( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
File proxiedFile = new File( proxiedRepository1.getBasedir(), path );
String expectedContents = FileUtils.readFileToString( proxiedFile, null );
- assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( file, null ) );
- assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( file, null ) ) );
+ assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
+ assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( proxied.getFile(), null ) ) );
- assertFalse( "Check checksum removed", new File( file.getParentFile(), file.getName() + ".sha1" ).exists() );
- assertFalse( "Check checksum removed", new File( file.getParentFile(), file.getName() + ".md5" ).exists() );
+ assertFalse( "Check checksum removed", new File( proxied.getFile().getParentFile(), proxied.getFile().getName() + ".sha1" ).exists() );
+ assertFalse( "Check checksum removed", new File( proxied.getFile().getParentFile(), proxied.getFile().getName() + ".md5" ).exists() );
}
public void testGetChecksumPresentInManagedRepo()
@@ -891,14 +891,14 @@
assertTrue( expectedFile.exists() );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
File proxiedFile = new File( proxiedRepository1.getBasedir(), path );
String unexpectedContents = FileUtils.readFileToString( proxiedFile, null );
- assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( file, null ) );
- assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( file, null ) ) );
+ assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
+ assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( proxied.getFile(), null ) ) );
}
public void testGetAlwaysChecksumPresentInManagedRepo()
@@ -911,14 +911,14 @@
assertTrue( expectedFile.exists() );
- File file = requestHandler.getAlways( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.getAlways( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
File proxiedFile = new File( proxiedRepository1.getBasedir(), path );
String unexpectedContents = FileUtils.readFileToString( proxiedFile, null );
- assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( file, null ) );
- assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( file, null ) ) );
+ assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
+ assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( proxied.getFile(), null ) ) );
}
public void testGetChecksumNotPresentInManagedRepo()
@@ -932,8 +932,8 @@
try
{
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- fail( "Found file: " + file + "; but was expecting a failure" );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ fail( "Found file: " + proxied.getFile() + "; but was expecting a failure" );
}
catch ( ResourceDoesNotExistException e )
{
@@ -954,8 +954,8 @@
try
{
- File file = requestHandler.getAlways( path, proxiedRepositories, defaultManagedRepository );
- fail( "Found file: " + file + "; but was expecting a failure" );
+ ProxiedArtifact proxied = requestHandler.getAlways( path, proxiedRepositories, defaultManagedRepository );
+ fail( "Found file: " + proxied.getFile() + "; but was expecting a failure" );
}
catch ( ResourceDoesNotExistException e )
{
@@ -975,8 +975,8 @@
try
{
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- fail( "Found file: " + file + "; but was expecting a failure" );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ fail( "Found file: " + proxied.getFile() + "; but was expecting a failure" );
}
catch ( ResourceDoesNotExistException e )
{
@@ -995,11 +995,11 @@
FileUtils.deleteDirectory( expectedFile.getParentFile() );
assertFalse( expectedFile.exists() );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
String expectedContents = getExpectedMetadata( "get-default-metadata", "1.0" );
- assertEquals( "Check content matches", expectedContents, FileUtils.readFileToString( file, null ) );
+ assertEquals( "Check content matches", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
}
/* TODO: test keeps failing in the reactor - needs to be made more robust before re-enabling
@@ -1011,14 +1011,14 @@
assertTrue( expectedFile.exists() );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
String expectedContents = getExpectedMetadata( "get-merged-metadata", getVersioning(
- Arrays.asList( new String[]{"0.9", "1.0", "2.0", "3.0", "5.0", "4.0"} ), file ) );
+ Arrays.asList( new String[]{"0.9", "1.0", "2.0", "3.0", "5.0", "4.0"} ), proxied.getFile() ) );
- assertEquals( "Check content matches", expectedContents, FileUtils.readFileToString( file, null ) );
+ assertEquals( "Check content matches", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
}
*/
@@ -1032,10 +1032,10 @@
assertTrue( expectedFile.exists() );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
- assertEquals( "Check content matches", expectedContents, FileUtils.readFileToString( file, null ) );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
+ assertEquals( "Check content matches", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
}
public void testGetReleaseMetadataNotExpired()
@@ -1052,15 +1052,15 @@
proxiedRepository1.getReleases().setUpdatePolicy( ArtifactRepositoryPolicy.UPDATE_POLICY_NEVER );
proxiedRepository1.getSnapshots().setUpdatePolicy( ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
- assertEquals( "Check content matches", expectedContents, FileUtils.readFileToString( file, null ) );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
+ assertEquals( "Check content matches", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
String unexpectedContents =
FileUtils.readFileToString( new File( proxiedRepository1.getBasedir(), path ), null );
assertFalse( "Check content doesn't match proxy version",
- unexpectedContents.equals( FileUtils.readFileToString( file, null ) ) );
+ unexpectedContents.equals( FileUtils.readFileToString( proxied.getFile(), null ) ) );
}
public void testGetSnapshotMetadataNotExpired()
@@ -1077,15 +1077,15 @@
proxiedRepository1.getReleases().setUpdatePolicy( ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS );
proxiedRepository1.getSnapshots().setUpdatePolicy( ArtifactRepositoryPolicy.UPDATE_POLICY_NEVER );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
- assertEquals( "Check content matches", expectedContents, FileUtils.readFileToString( file, null ) );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
+ assertEquals( "Check content matches", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
String unexpectedContents =
FileUtils.readFileToString( new File( proxiedRepository1.getBasedir(), path ), null );
assertFalse( "Check content doesn't match proxy version",
- unexpectedContents.equals( FileUtils.readFileToString( file, null ) ) );
+ unexpectedContents.equals( FileUtils.readFileToString( proxied.getFile(), null ) ) );
}
public void testGetReleaseMetadataExpired()
@@ -1102,16 +1102,16 @@
proxiedRepository1.getReleases().setUpdatePolicy( ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS );
proxiedRepository1.getSnapshots().setUpdatePolicy( ArtifactRepositoryPolicy.UPDATE_POLICY_NEVER );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
String expectedContents = getExpectedMetadata( "get-updated-metadata", getVersioning(
- Arrays.asList( new String[]{"1.0", "2.0"} ), file ) );
+ Arrays.asList( new String[]{"1.0", "2.0"} ), proxied.getFile() ) );
- assertEquals( "Check content matches", expectedContents, FileUtils.readFileToString( file, null ) );
+ assertEquals( "Check content matches", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
assertFalse( "Check content doesn't match proxy version",
- unexpectedContents.equals( FileUtils.readFileToString( file, null ) ) );
+ unexpectedContents.equals( FileUtils.readFileToString( proxied.getFile(), null ) ) );
}
/* TODO: test keeps failing in the reactor - needs to be made more robust before re-enabling
@@ -1129,16 +1129,16 @@
proxiedRepository1.getReleases().setUpdatePolicy( ArtifactRepositoryPolicy.UPDATE_POLICY_NEVER );
proxiedRepository1.getSnapshots().setUpdatePolicy( ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
String expectedContents =
- getExpectedMetadata( "get-updated-metadata", "1.0-SNAPSHOT", getVersioning( "20050831.111213", 2, file ) );
+ getExpectedMetadata( "get-updated-metadata", "1.0-SNAPSHOT", getVersioning( "20050831.111213", 2, proxied.getFile() ) );
- assertEquals( "Check content matches", expectedContents, FileUtils.readFileToString( file, null ) );
+ assertEquals( "Check content matches", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
assertFalse( "Check content doesn't match proxy version",
- unexpectedContents.equals( FileUtils.readFileToString( file, null ) ) );
+ unexpectedContents.equals( FileUtils.readFileToString( proxied.getFile(), null ) ) );
}
public void testGetMetadataNotUpdated()
@@ -1155,14 +1155,14 @@
new File( expectedFile.getParentFile(), ".metadata-proxied1" ).setLastModified( proxiedFile.lastModified() );
proxiedRepository1.getReleases().setUpdatePolicy( ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
- assertEquals( "Check content matches", expectedContents, FileUtils.readFileToString( file, null ) );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
+ assertEquals( "Check content matches", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
String unexpectedContents = FileUtils.readFileToString( proxiedFile, null );
assertFalse( "Check content doesn't match proxy version",
- unexpectedContents.equals( FileUtils.readFileToString( file, null ) ) );
+ unexpectedContents.equals( FileUtils.readFileToString( proxied.getFile(), null ) ) );
}
public void testGetMetadataUpdated()
@@ -1177,15 +1177,15 @@
new File( expectedFile.getParentFile(), ".metadata-proxied1" ).setLastModified( getPastDate().getTime() );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
String expectedContents = getExpectedMetadata( "get-updated-metadata", getVersioning(
- Arrays.asList( new String[]{"1.0", "2.0"} ), file ) );
- assertEquals( "Check content matches", expectedContents, FileUtils.readFileToString( file, null ) );
+ Arrays.asList( new String[]{"1.0", "2.0"} ), proxied.getFile() ) );
+ assertEquals( "Check content matches", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
assertFalse( "Check content doesn't match old version",
- unexpectedContents.equals( FileUtils.readFileToString( file, null ) ) );
+ unexpectedContents.equals( FileUtils.readFileToString( proxied.getFile(), null ) ) );
}
public void testGetAlwaysMetadata()
@@ -1198,16 +1198,16 @@
assertTrue( expectedFile.exists() );
- File file = requestHandler.getAlways( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
+ ProxiedArtifact proxied = requestHandler.getAlways( path, proxiedRepositories, defaultManagedRepository );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
String expectedContents = getExpectedMetadata( "get-updated-metadata", getVersioning(
- Arrays.asList( new String[]{"1.0", "2.0"} ), file ) );
+ Arrays.asList( new String[]{"1.0", "2.0"} ), proxied.getFile() ) );
- assertEquals( "Check content matches", expectedContents, FileUtils.readFileToString( file, null ) );
+ assertEquals( "Check content matches", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
assertFalse( "Check content doesn't match old version",
- unexpectedContents.equals( FileUtils.readFileToString( file, null ) ) );
+ unexpectedContents.equals( FileUtils.readFileToString( proxied.getFile(), null ) ) );
}
*/
@@ -1221,8 +1221,8 @@
try
{
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- fail( "File returned was: " + file + "; should have got a not found exception" );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ fail( "File returned was: " + proxied.getFile() + "; should have got a not found exception" );
}
catch ( ResourceDoesNotExistException e )
{
@@ -1241,13 +1241,13 @@
expectedFile.delete();
assertFalse( expectedFile.exists() );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
File proxiedFile = new File( proxiedRepository1.getBasedir(), path );
String expectedContents = FileUtils.readFileToString( proxiedFile, null );
- assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( file, null ) );
+ assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
}
public void testNewerTimestampDrivenSnapshotOnFirstRepo()
@@ -1261,13 +1261,13 @@
expectedFile.setLastModified( getPastDate().getTime() );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
File proxiedFile = new File( proxiedRepository1.getBasedir(), path );
String expectedContents = FileUtils.readFileToString( proxiedFile, null );
- assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( file, null ) );
+ assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
}
public void testOlderTimestampDrivenSnapshotOnFirstRepo()
@@ -1283,15 +1283,15 @@
expectedFile.setLastModified( getFutureDate().getTime() );
proxiedRepository1.getSnapshots().setUpdatePolicy( ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
- assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( file, null ) );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
+ assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
File proxiedFile = new File( proxiedRepository1.getBasedir(), path );
String unexpectedContents = FileUtils.readFileToString( proxiedFile, null );
- assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( file, null ) ) );
+ assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( proxied.getFile(), null ) ) );
}
/* TODO: won't pass until Wagon preserves timestamp on download
@@ -1315,18 +1315,18 @@
proxiedRepositories.add( createProxiedRepository( proxiedRepository1 ) );
proxiedRepositories.add( createProxiedRepository( proxiedRepository2 ) );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
File proxiedFile = new File( proxiedRepository2.getBasedir(), path );
String expectedContents = FileUtils.readFileToString( proxiedFile, null );
- assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( file, null ) );
+ assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
proxiedFile = new File( proxiedRepository1.getBasedir(), path );
String unexpectedContents = FileUtils.readFileToString( proxiedFile, null );
- assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( file, null ) ) );
+ assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( proxied.getFile(), null ) ) );
}
*/
@@ -1351,18 +1351,18 @@
proxiedRepositories.add( createProxiedRepository( proxiedRepository1 ) );
proxiedRepositories.add( createProxiedRepository( proxiedRepository2 ) );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
File proxiedFile = new File( proxiedRepository1.getBasedir(), path );
String expectedContents = FileUtils.readFileToString( proxiedFile, null );
- assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( file, null ) );
+ assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
proxiedFile = new File( proxiedRepository2.getBasedir(), path );
String unexpectedContents = FileUtils.readFileToString( proxiedFile, null );
- assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( file, null ) ) );
+ assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( proxied.getFile(), null ) ) );
}
public void testTimestampDrivenSnapshotNotExpired()
@@ -1377,15 +1377,15 @@
File proxiedFile = new File( proxiedRepository1.getBasedir(), path );
proxiedFile.setLastModified( getFutureDate().getTime() );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
String expectedContents = FileUtils.readFileToString( expectedFile, null );
- assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( file, null ) );
+ assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
String unexpectedContents = FileUtils.readFileToString( proxiedFile, null );
- assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( file, null ) ) );
+ assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( proxied.getFile(), null ) ) );
}
public void testTimestampDrivenSnapshotNotUpdated()
@@ -1402,14 +1402,14 @@
expectedFile.setLastModified( proxiedFile.lastModified() );
proxiedRepository1.getSnapshots().setUpdatePolicy( ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
- assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( file, null ) );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
+ assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
String unexpectedContents = FileUtils.readFileToString( proxiedFile, null );
- assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( file, null ) ) );
+ assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( proxied.getFile(), null ) ) );
}
public void testTimestampDrivenSnapshotNotPresentAlreadyExpiredCacheFailure()
@@ -1427,14 +1427,14 @@
proxiedArtifactRepository.addFailure( path, ALWAYS_UPDATE_POLICY );
proxiedRepositories.add( proxiedArtifactRepository );
proxiedRepositories.add( createProxiedRepository( proxiedRepository2 ) );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
File proxiedFile = new File( proxiedRepository1.getBasedir(), path );
String expectedContents = FileUtils.readFileToString( proxiedFile, null );
- assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( file, null ) );
+ assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
assertFalse( "Check failure", proxiedArtifactRepository.isCachedFailure( path ) );
}
@@ -1449,13 +1449,13 @@
expectedFile.delete();
assertFalse( expectedFile.exists() );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
File proxiedFile = new File( proxiedRepository1.getBasedir(), path );
String expectedContents = FileUtils.readFileToString( proxiedFile, null );
- assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( file, null ) );
+ assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
}
public void testGetMetadataDrivenSnapshotRemoteUpdate()
@@ -1473,14 +1473,14 @@
expectedFile.setLastModified( getPastDate().getTime() );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
- assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( file, null ) );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
+ assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
File proxiedFile = new File( proxiedRepository1.getBasedir(), path );
String unexpectedContents = FileUtils.readFileToString( proxiedFile, null );
- assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( file, null ) ) );
+ assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( proxied.getFile(), null ) ) );
}
public void testLegacyManagedRepoGetNotPresent()
@@ -1491,16 +1491,16 @@
assertFalse( expectedFile.exists() );
- File file = requestHandler.get( path, proxiedRepositories, legacyManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, legacyManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
File proxiedFile = new File( proxiedRepository1.getBasedir(),
"org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar" );
String expectedContents = FileUtils.readFileToString( proxiedFile, null );
- assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( file, null ) );
+ assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
// TODO: timestamp preservation requires support for that in wagon
-// assertEquals( "Check file timestamp", proxiedFile.lastModified(), file.lastModified() );
+// assertEquals( "Check file timestamp", proxiedFile.lastModified(), proxied.getFile().lastModified() );
}
public void testLegacyManagedRepoGetAlreadyPresent()
@@ -1513,18 +1513,18 @@
assertTrue( expectedFile.exists() );
- File file = requestHandler.get( path, proxiedRepositories, legacyManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, legacyManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
- assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( file, null ) );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
+ assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
File proxiedFile = new File( proxiedRepository1.getBasedir(),
"org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar" );
String unexpectedContents = FileUtils.readFileToString( proxiedFile, null );
- assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( file, null ) ) );
- assertFalse( "Check file timestamp is not that of proxy", proxiedFile.lastModified() == file.lastModified() );
+ assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( proxied.getFile(), null ) ) );
+ assertFalse( "Check file timestamp is not that of proxy", proxiedFile.lastModified() == proxied.getFile().lastModified() );
assertEquals( "Check file timestamp is that of original managed file", originalModificationTime,
- file.lastModified() );
+ proxied.getFile().lastModified() );
}
public void testLegacyProxyRepoGetNotPresent()
@@ -1536,16 +1536,16 @@
expectedFile.delete();
assertFalse( expectedFile.exists() );
- File file = requestHandler.get( path, legacyProxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, legacyProxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
File proxiedFile =
new File( legacyProxiedRepository.getBasedir(), "org.apache.maven.test/jars/get-default-layout-1.0.jar" );
String expectedContents = FileUtils.readFileToString( proxiedFile, null );
- assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( file, null ) );
+ assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
// TODO: timestamp preservation requires support for that in wagon
-// assertEquals( "Check file timestamp", proxiedFile.lastModified(), file.lastModified() );
+// assertEquals( "Check file timestamp", proxiedFile.lastModified(), proxied.getFile().lastModified() );
}
public void testLegacyProxyRepoGetAlreadyPresent()
@@ -1558,18 +1558,18 @@
assertTrue( expectedFile.exists() );
- File file = requestHandler.get( path, legacyProxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, legacyProxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
- assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( file, null ) );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
+ assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
File proxiedFile = new File( legacyProxiedRepository.getBasedir(),
"org.apache.maven.test/jars/get-default-layout-present-1.0.jar" );
String unexpectedContents = FileUtils.readFileToString( proxiedFile, null );
- assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( file, null ) ) );
- assertFalse( "Check file timestamp is not that of proxy", proxiedFile.lastModified() == file.lastModified() );
+ assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( proxied.getFile(), null ) ) );
+ assertFalse( "Check file timestamp is not that of proxy", proxiedFile.lastModified() == proxied.getFile().lastModified() );
assertEquals( "Check file timestamp is that of original managed file", originalModificationTime,
- file.lastModified() );
+ proxied.getFile().lastModified() );
}
public void testLegacyManagedAndProxyRepoGetNotPresent()
@@ -1580,15 +1580,15 @@
assertFalse( expectedFile.exists() );
- File file = requestHandler.get( path, legacyProxiedRepositories, legacyManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, legacyProxiedRepositories, legacyManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
File proxiedFile = new File( legacyProxiedRepository.getBasedir(), path );
String expectedContents = FileUtils.readFileToString( proxiedFile, null );
- assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( file, null ) );
+ assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
// TODO: timestamp preservation requires support for that in wagon
-// assertEquals( "Check file timestamp", proxiedFile.lastModified(), file.lastModified() );
+// assertEquals( "Check file timestamp", proxiedFile.lastModified(), proxied.getFile().lastModified() );
}
public void testLegacyManagedAndProxyRepoGetAlreadyPresent()
@@ -1601,17 +1601,17 @@
assertTrue( expectedFile.exists() );
- File file = requestHandler.get( path, legacyProxiedRepositories, legacyManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, legacyProxiedRepositories, legacyManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
- assertTrue( "Check file created", file.exists() );
- assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( file, null ) );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
+ assertTrue( "Check file created", proxied.getFile().exists() );
+ assertEquals( "Check file contents", expectedContents, FileUtils.readFileToString( proxied.getFile(), null ) );
File proxiedFile = new File( legacyProxiedRepository.getBasedir(), path );
String unexpectedContents = FileUtils.readFileToString( proxiedFile, null );
- assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( file, null ) ) );
- assertFalse( "Check file timestamp is not that of proxy", proxiedFile.lastModified() == file.lastModified() );
+ assertFalse( "Check file contents", unexpectedContents.equals( FileUtils.readFileToString( proxied.getFile(), null ) ) );
+ assertFalse( "Check file timestamp is not that of proxy", proxiedFile.lastModified() == proxied.getFile().lastModified() );
assertEquals( "Check file timestamp is that of original managed file", originalModificationTime,
- file.lastModified() );
+ proxied.getFile().lastModified() );
}
public void testLegacyRequestConvertedToDefaultPathInManagedRepo()
@@ -1625,9 +1625,9 @@
File expectedFile = new File( defaultManagedRepository.getBasedir(), path );
assertTrue( expectedFile.exists() );
- File file = requestHandler.get( legacyPath, legacyProxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( legacyPath, legacyProxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
}
public void testDefaultRequestConvertedToLegacyPathInManagedRepo()
@@ -1641,9 +1641,9 @@
File expectedFile = new File( legacyManagedRepository.getBasedir(), legacyPath );
assertTrue( expectedFile.exists() );
- File file = requestHandler.get( path, proxiedRepositories, legacyManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, legacyManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
}
public void testRelocateMaven1Request()
@@ -1656,9 +1656,10 @@
assertTrue( expectedFile.exists() );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
+ assertEquals( "Check relocated path", relocatedPath, proxied.getPath() );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
}
public void testDoublyRelocateMaven1Request()
@@ -1671,9 +1672,10 @@
assertTrue( expectedFile.exists() );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
+ assertEquals( "Check relocated path", relocatedPath, proxied.getPath() );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
}
public void testRelocateMaven1PomRequest()
@@ -1686,9 +1688,10 @@
assertTrue( expectedFile.exists() );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
+ assertEquals( "Check relocated path", relocatedPath, proxied.getPath() );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
assertTrue( expectedFile.exists() );
}
@@ -1724,9 +1727,9 @@
assertTrue( expectedFile.exists() );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
assertTrue( expectedFile.exists() );
@@ -1747,33 +1750,33 @@
}
}
- public void testRelocateMaven2Request()
+ public void testDontRelocateMaven2Request()
throws IOException, ResourceDoesNotExistException, ProxyException
{
- String path = "org/apache/maven/test/get-relocated-artefact/1.0/get-relocated-artefact-1.0.jar";
- String relocatedPath =
- "org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar";
- File expectedFile = new File( defaultManagedRepository.getBasedir(), relocatedPath );
+ String path = "org/apache/maven/test/get-relocated-artefact/1.0/get-relocated-artefact-1.0.pom";
+ File expectedFile = new File( defaultManagedRepository.getBasedir(), path );
assertTrue( expectedFile.exists() );
- File file = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, defaultManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
+ assertEquals( "Check path matches", path, proxied.getPath() );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
}
- public void testRelocateMaven2RequestInLegacyManagedRepo()
+ public void testDontRelocateMaven2RequestInLegacyManagedRepo()
throws IOException, ResourceDoesNotExistException, ProxyException
{
- String path = "org/apache/maven/test/get-relocated-artefact/1.0/get-relocated-artefact-1.0.jar";
- String relocatedPath = "org.apache.maven.test/jars/get-default-layout-present-1.0.jar";
- File expectedFile = new File( legacyManagedRepository.getBasedir(), relocatedPath );
+ String path = "org/apache/maven/test/get-relocated-artefact/1.0/get-relocated-artefact-1.0.pom";
+ String legacyPath = "org.apache.maven.test/poms/get-relocated-artefact-1.0.pom";
+ File expectedFile = new File( legacyManagedRepository.getBasedir(), legacyPath );
assertTrue( expectedFile.exists() );
- File file = requestHandler.get( path, proxiedRepositories, legacyManagedRepository );
+ ProxiedArtifact proxied = requestHandler.get( path, proxiedRepositories, legacyManagedRepository );
- assertEquals( "Check file matches", expectedFile, file );
+ assertEquals( "Check path matches", legacyPath, proxied.getPath() );
+ assertEquals( "Check file matches", expectedFile, proxied.getFile() );
}
private static Versioning getVersioning( List versions, File file )