Author: janb
Date: Tue Jul 29 22:30:41 2008
New Revision: 680912
URL: http://svn.apache.org/viewvc?rev=680912&view=rev
Log:
Use new transport.api.Binding instead of spi.http.client.Binding
Removed:
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/Binding.java
Modified:
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/FileExchange.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/MercuryException.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DefaultDeployer.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeployRequest.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeploymentTarget.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/FilePutExchange.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/DefaultRetrievalRequest.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/DefaultRetriever.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/FileGetExchange.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalRequest.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalTarget.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/transport/api/Binding.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/transport/api/TransportTransaction.java
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/repository/metadata/MetadataReaderTest.java
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/client/JettyDeployerTest.java
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/client/JettyRetrieverTest.java
Modified:
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java?rev=680912&r1=680911&r2=680912&view=diff
==============================================================================
---
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java
(original)
+++
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java
Tue Jul 29 22:30:41 2008
@@ -4,6 +4,7 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import java.net.URL;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -25,11 +26,11 @@
import org.apache.maven.mercury.repository.api.RepositoryReader;
import org.apache.maven.mercury.repository.metadata.Metadata;
import org.apache.maven.mercury.repository.metadata.io.xpp3.MetadataXpp3Reader;
-import org.apache.maven.mercury.spi.http.client.Binding;
import org.apache.maven.mercury.spi.http.client.MercuryException;
import
org.apache.maven.mercury.spi.http.client.retrieve.DefaultRetrievalRequest;
import org.apache.maven.mercury.spi.http.client.retrieve.DefaultRetriever;
import org.apache.maven.mercury.spi.http.client.retrieve.RetrievalResponse;
+import org.apache.maven.mercury.transport.api.Binding;
import org.codehaus.plexus.i18n.DefaultLanguage;
import org.codehaus.plexus.i18n.Language;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -241,7 +242,7 @@
try
{
File tempFile = File.createTempFile( "mercury", "readraw" );
- Binding binding = new Binding(
_repo.getServer().getURL().toString()+'/'+path , tempFile, false );
+ Binding binding = new Binding( new
URL(_repo.getServer().getURL().toString()+'/'+path) , tempFile);
DefaultRetrievalRequest request = new DefaultRetrievalRequest();
request.addBinding( binding );
Modified:
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/FileExchange.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/FileExchange.java?rev=680912&r1=680911&r2=680912&view=diff
==============================================================================
---
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/FileExchange.java
(original)
+++
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/FileExchange.java
Tue Jul 29 22:30:41 2008
@@ -19,11 +19,13 @@
package org.apache.maven.mercury.spi.http.client;
+import org.apache.maven.mercury.transport.api.Binding;
import org.mortbay.io.Buffer;
import org.mortbay.jetty.client.HttpClient;
import org.mortbay.jetty.client.HttpExchange;
import java.io.File;
+import java.net.URL;
/**
* FileExchange
@@ -52,7 +54,13 @@
public FileExchange( Binding binding, File localFile, HttpClient client )
{
_binding = binding;
- _url = binding.getRemoteUrl();
+ if (_binding != null)
+ {
+ URL url = binding.getRemoteResource();
+ if (url != null)
+ _url = url.toString();
+ }
+
_localFile = localFile;
_httpClient = client;
setURL( _url );
Modified:
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/MercuryException.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/MercuryException.java?rev=680912&r1=680911&r2=680912&view=diff
==============================================================================
---
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/MercuryException.java
(original)
+++
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/MercuryException.java
Tue Jul 29 22:30:41 2008
@@ -32,6 +32,7 @@
//========================================================================
package org.apache.maven.mercury.spi.http.client;
+import org.apache.maven.mercury.transport.api.Binding;
/**
* BatchException
Modified:
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DefaultDeployer.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DefaultDeployer.java?rev=680912&r1=680911&r2=680912&view=diff
==============================================================================
---
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DefaultDeployer.java
(original)
+++
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DefaultDeployer.java
Tue Jul 29 22:30:41 2008
@@ -19,10 +19,11 @@
package org.apache.maven.mercury.spi.http.client.deploy;
-import org.apache.maven.mercury.spi.http.client.Binding;
+
import org.apache.maven.mercury.spi.http.client.FileExchange;
import org.apache.maven.mercury.spi.http.client.HandshakeExchange;
import org.apache.maven.mercury.spi.http.client.MercuryException;
+import org.apache.maven.mercury.transport.api.Binding;
import org.apache.maven.mercury.transport.api.Server;
import org.apache.maven.mercury.transport.api.StreamObserver;
import org.apache.maven.mercury.transport.api.StreamObserverFactory;
@@ -307,10 +308,10 @@
private Server resolveServer (Binding binding)
throws MalformedURLException
{
- if (binding.getRemoteUrl() == null)
+ if (binding.getRemoteResource() == null)
return null;
- URL bindingURL = new URL(binding.getRemoteUrl());
+ URL bindingURL = binding.getRemoteResource();
Iterator<Server> itor = _servers.iterator();
Server server = null;
while(itor.hasNext() && server==null)
Modified:
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeployRequest.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeployRequest.java?rev=680912&r1=680911&r2=680912&view=diff
==============================================================================
---
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeployRequest.java
(original)
+++
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeployRequest.java
Tue Jul 29 22:30:41 2008
@@ -21,8 +21,9 @@
import java.util.Set;
-import org.apache.maven.mercury.spi.http.client.Binding;
+
import org.apache.maven.mercury.spi.http.validate.Validator;
+import org.apache.maven.mercury.transport.api.Binding;
/**
Modified:
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeploymentTarget.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeploymentTarget.java?rev=680912&r1=680911&r2=680912&view=diff
==============================================================================
---
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeploymentTarget.java
(original)
+++
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeploymentTarget.java
Tue Jul 29 22:30:41 2008
@@ -19,9 +19,9 @@
package org.apache.maven.mercury.spi.http.client.deploy;
-import org.apache.maven.mercury.spi.http.client.Binding;
import org.apache.maven.mercury.spi.http.client.MercuryException;
import org.apache.maven.mercury.spi.http.validate.Validator;
+import org.apache.maven.mercury.transport.api.Binding;
import org.apache.maven.mercury.transport.api.StreamObserver;
import org.apache.maven.mercury.transport.api.Verifier;
import org.mortbay.jetty.client.HttpClient;
@@ -29,6 +29,7 @@
import java.io.File;
import java.io.FileOutputStream;
import java.io.OutputStreamWriter;
+import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
@@ -216,14 +217,17 @@
//calculated as we uploaded the file
try
{
-
- binding = new Binding();
- binding.setRemoteUrl( _binding.getRemoteUrl() + v.getExtension() );
+ URL url = _binding.getRemoteResource();
+ if (url != null)
+ {
+ url = new URL( url.toString() + v.getExtension());
+ }
+
file = File.createTempFile( _binding.getLocalFile().getName() +
v.getExtension(), ".tmp" );
OutputStreamWriter fw = new OutputStreamWriter( new
FileOutputStream( file ), "UTF-8" );
fw.write( v.getSignature() );
fw.close();
- binding.setLocalFile( file );
+ binding = new Binding(url, file);
}
catch ( Exception e )
{
@@ -272,6 +276,6 @@
public String toString()
{
- return "DeploymentTarget:" + _binding.getRemoteUrl() + ":" +
_targetState + ":" + _checksumState + ":" + isComplete();
+ return "DeploymentTarget:" + _binding.getRemoteResource() + ":" +
_targetState + ":" + _checksumState + ":" + isComplete();
}
}
Modified:
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/FilePutExchange.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/FilePutExchange.java?rev=680912&r1=680911&r2=680912&view=diff
==============================================================================
---
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/FilePutExchange.java
(original)
+++
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/FilePutExchange.java
Tue Jul 29 22:30:41 2008
@@ -19,11 +19,12 @@
package org.apache.maven.mercury.spi.http.client.deploy;
-import org.apache.maven.mercury.spi.http.client.Binding;
+
import org.apache.maven.mercury.spi.http.client.FileExchange;
import org.apache.maven.mercury.spi.http.client.MercuryException;
import org.apache.maven.mercury.spi.http.client.ObservableInputStream;
import org.apache.maven.mercury.transport.ChecksumCalculator;
+import org.apache.maven.mercury.transport.api.Binding;
import org.apache.maven.mercury.transport.api.StreamObserver;
import org.mortbay.io.Buffer;
import org.mortbay.jetty.HttpMethods;
Modified:
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/DefaultRetrievalRequest.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/DefaultRetrievalRequest.java?rev=680912&r1=680911&r2=680912&view=diff
==============================================================================
---
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/DefaultRetrievalRequest.java
(original)
+++
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/DefaultRetrievalRequest.java
Tue Jul 29 22:30:41 2008
@@ -22,8 +22,9 @@
import java.util.HashSet;
import java.util.Set;
-import org.apache.maven.mercury.spi.http.client.Binding;
+
import org.apache.maven.mercury.spi.http.validate.Validator;
+import org.apache.maven.mercury.transport.api.Binding;
public class DefaultRetrievalRequest implements RetrievalRequest
{
Modified:
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/DefaultRetriever.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/DefaultRetriever.java?rev=680912&r1=680911&r2=680912&view=diff
==============================================================================
---
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/DefaultRetriever.java
(original)
+++
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/DefaultRetriever.java
Tue Jul 29 22:30:41 2008
@@ -19,8 +19,9 @@
package org.apache.maven.mercury.spi.http.client.retrieve;
-import org.apache.maven.mercury.spi.http.client.Binding;
+
import org.apache.maven.mercury.spi.http.client.MercuryException;
+import org.apache.maven.mercury.transport.api.Binding;
import org.apache.maven.mercury.transport.api.Server;
import org.apache.maven.mercury.transport.api.StreamObserver;
import org.apache.maven.mercury.transport.api.StreamObserverFactory;
@@ -276,10 +277,10 @@
private Server resolveServer (Binding binding)
throws MalformedURLException
{
- if (binding.getRemoteUrl() == null)
+ if (binding.getRemoteResource() == null)
return null;
- URL bindingURL = new URL(binding.getRemoteUrl());
+ URL bindingURL = binding.getRemoteResource();
if (_servers == null)
return null;
Modified:
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/FileGetExchange.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/FileGetExchange.java?rev=680912&r1=680911&r2=680912&view=diff
==============================================================================
---
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/FileGetExchange.java
(original)
+++
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/FileGetExchange.java
Tue Jul 29 22:30:41 2008
@@ -30,10 +30,11 @@
import javax.servlet.http.HttpServletResponse;
-import org.apache.maven.mercury.spi.http.client.Binding;
+
import org.apache.maven.mercury.spi.http.client.FileExchange;
import org.apache.maven.mercury.spi.http.client.MercuryException;
import org.apache.maven.mercury.spi.http.client.ObservableOutputStream;
+import org.apache.maven.mercury.transport.api.Binding;
import org.apache.maven.mercury.transport.api.StreamObserver;
import org.mortbay.io.Buffer;
import org.mortbay.jetty.HttpMethods;
Modified:
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalRequest.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalRequest.java?rev=680912&r1=680911&r2=680912&view=diff
==============================================================================
---
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalRequest.java
(original)
+++
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalRequest.java
Tue Jul 29 22:30:41 2008
@@ -21,8 +21,9 @@
import java.util.Set;
-import org.apache.maven.mercury.spi.http.client.Binding;
+
import org.apache.maven.mercury.spi.http.validate.Validator;
+import org.apache.maven.mercury.transport.api.Binding;
/**
Modified:
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalTarget.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalTarget.java?rev=680912&r1=680911&r2=680912&view=diff
==============================================================================
---
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalTarget.java
(original)
+++
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalTarget.java
Tue Jul 29 22:30:41 2008
@@ -19,15 +19,7 @@
package org.apache.maven.mercury.spi.http.client.retrieve;
-import org.apache.maven.mercury.spi.http.client.Binding;
-import org.apache.maven.mercury.spi.http.client.FileExchange;
-import org.apache.maven.mercury.spi.http.client.MercuryException;
-import org.apache.maven.mercury.spi.http.validate.Validator;
-import org.apache.maven.mercury.transport.api.StreamObserver;
-import org.apache.maven.mercury.transport.api.Verifier;
-import org.mortbay.jetty.client.HttpExchange;
-import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
@@ -35,10 +27,19 @@
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
-import java.util.ListIterator;
import java.util.Map;
import java.util.Set;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.maven.mercury.spi.http.client.FileExchange;
+import org.apache.maven.mercury.spi.http.client.MercuryException;
+import org.apache.maven.mercury.spi.http.validate.Validator;
+import org.apache.maven.mercury.transport.api.Binding;
+import org.apache.maven.mercury.transport.api.StreamObserver;
+import org.apache.maven.mercury.transport.api.Verifier;
+import org.mortbay.jetty.client.HttpExchange;
+
/**
* RetrievalTarget
@@ -83,7 +84,7 @@
*/
public RetrievalTarget( DefaultRetriever retriever, Binding binding,
Set<Validator> validators, Set<StreamObserver> observers )
{
- if ( binding == null || binding.getRemoteUrl() == null ||
binding.getLocalFile() == null )
+ if ( binding == null || binding.getRemoteResource() == null ||
binding.getLocalFile() == null )
{
throw new IllegalArgumentException( "No file to retrieve" );
}
@@ -130,7 +131,7 @@
public String getUrl()
{
- return _binding.getRemoteUrl();
+ return _binding.getRemoteResource().toExternalForm();
}
@@ -174,7 +175,7 @@
public String toString()
{
- return "T:" + _binding.getRemoteUrl() + ":" + _targetState + ":" +
_checksumState + ":" + _complete;
+ return "T:" + _binding.getRemoteResource() + ":" + _targetState + ":"
+ _checksumState + ":" + _complete;
}
private void updateChecksumState (int index, Throwable ex)
@@ -416,7 +417,7 @@
String extension = verifier.getExtension();
if (extension.charAt(0) != '.')
extension = "."+extension;
- return _binding.getRemoteUrl() + extension;
+ return _binding.getRemoteResource().toString() + extension;
}
private boolean deleteTempFile()
Modified:
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/transport/api/Binding.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/transport/api/Binding.java?rev=680912&r1=680911&r2=680912&view=diff
==============================================================================
---
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/transport/api/Binding.java
(original)
+++
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/transport/api/Binding.java
Tue Jul 29 22:30:41 2008
@@ -22,7 +22,7 @@
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.InputStream;
-import java.net.URI;
+import java.net.URL;
import org.apache.maven.mercury.repository.api.RepositoryException;
@@ -35,7 +35,7 @@
{
private static final org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger( Binding.class );
- protected URI remoteResource;
+ protected URL remoteResource;
protected File localFile;
/**
* inbound in-memory binding for reading remote content.
@@ -47,7 +47,6 @@
*/
protected InputStream localIS;
- protected boolean lenientChecksum = true;
protected RepositoryException error;
@@ -56,13 +55,12 @@
}
public Binding(
- URI remoteUrl,
- File localFile,
- boolean lenientChecksum )
+ URL remoteUrl,
+ File localFile)
{
this.remoteResource = remoteUrl;
this.localFile = localFile;
- this.lenientChecksum = lenientChecksum;
+
}
/**
@@ -71,38 +69,26 @@
* @param remoteUrl
* @param lenientChecksum
*/
- public Binding( URI remoteUrl, boolean lenientChecksum )
+ public Binding( URL remoteUrl )
{
this.remoteResource = remoteUrl;
// let's assume 4k on average
this.localOS = new ByteArrayOutputStream( 4*1024 );
- this.lenientChecksum = lenientChecksum;
}
- public Binding( URI remoteUrl, InputStream is, boolean lenientChecksum )
+ public Binding( URL remoteUrl, InputStream is )
{
this.remoteResource = remoteUrl;
this.localIS = is;
- this.lenientChecksum = lenientChecksum;
- }
-
- public boolean isLenientChecksum()
- {
- return lenientChecksum;
- }
-
- public void setLenientChecksum( boolean leniantChecksum )
- {
- this.lenientChecksum = leniantChecksum;
}
- public URI getRemoteResource()
+ public URL getRemoteResource()
{
return remoteResource;
}
public void setRemoteResource(
- URI remoteResource )
+ URL remoteResource )
{
this.remoteResource = remoteResource;
}
@@ -120,7 +106,7 @@
public boolean isInMemory()
{
- return localIS != null || localOS != null;
+ return (!isFile() && (localIS != null || localOS != null));
}
public boolean isFile()
@@ -135,5 +121,10 @@
return null;
}
+
+ public File getLocalFile ()
+ {
+ return localFile;
+ }
}
Modified:
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/transport/api/TransportTransaction.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/transport/api/TransportTransaction.java?rev=680912&r1=680911&r2=680912&view=diff
==============================================================================
---
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/transport/api/TransportTransaction.java
(original)
+++
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/transport/api/TransportTransaction.java
Tue Jul 29 22:30:41 2008
@@ -3,7 +3,7 @@
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.InputStream;
-import java.net.URI;
+import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -53,47 +53,39 @@
return this;
}
//------------------------------------------------------------------------------------------------
- public TransportTransaction add( URI remoteResource, File localResource,
boolean lenientChecksum )
+ public TransportTransaction add( URL remoteResource, File localResource )
{
init();
- _bindings.add( new Binding( remoteResource, localResource, lenientChecksum
) );
+ _bindings.add( new Binding( remoteResource, localResource ) );
return this;
}
//------------------------------------------------------------------------------------------------
- public TransportTransaction add( URI remoteResource, boolean lenientChecksum
)
+ public TransportTransaction add( URL remoteResource )
{
init();
- _bindings.add( new Binding( remoteResource, lenientChecksum ) );
+ _bindings.add( new Binding( remoteResource ) );
return this;
}
//------------------------------------------------------------------------------------------------
- public TransportTransaction add( URI remoteResource, InputStream is, boolean
lenientChecksum )
+ public TransportTransaction add( URL remoteResource, InputStream is )
{
init();
- _bindings.add( new Binding( remoteResource, is, lenientChecksum ) );
-
- return this;
- }
-
//------------------------------------------------------------------------------------------------
- public TransportTransaction add( URI remoteResource, File localResource )
- {
- init();
-
- _bindings.add( new Binding( remoteResource, localResource, true ) );
+ _bindings.add( new Binding( remoteResource, is ) );
return this;
}
+
//------------------------------------------------------------------------------------------------
- public TransportTransaction add( URI remoteResource, byte [] localResource )
+ public TransportTransaction add( URL remoteResource, byte [] localResource )
{
init();
- _bindings.add( new Binding( remoteResource, new
ByteArrayInputStream(localResource), true ) );
+ _bindings.add( new Binding( remoteResource, new
ByteArrayInputStream(localResource)) );
return this;
}
Modified:
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/repository/metadata/MetadataReaderTest.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/repository/metadata/MetadataReaderTest.java?rev=680912&r1=680911&r2=680912&view=diff
==============================================================================
---
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/repository/metadata/MetadataReaderTest.java
(original)
+++
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/repository/metadata/MetadataReaderTest.java
Tue Jul 29 22:30:41 2008
@@ -4,17 +4,18 @@
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.net.URL;
import java.util.HashSet;
import java.util.List;
import junit.framework.TestCase;
import org.apache.maven.mercury.repository.metadata.io.xpp3.MetadataXpp3Reader;
-import org.apache.maven.mercury.spi.http.client.Binding;
import
org.apache.maven.mercury.spi.http.client.retrieve.DefaultRetrievalRequest;
import org.apache.maven.mercury.spi.http.client.retrieve.DefaultRetriever;
import org.apache.maven.mercury.spi.http.client.retrieve.RetrievalResponse;
import org.apache.maven.mercury.spi.http.server.HttpTestServer;
+import org.apache.maven.mercury.transport.api.Binding;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
public class MetadataReaderTest
@@ -62,7 +63,7 @@
File temp = File.createTempFile("maven", "metadata" );
HashSet<Binding> bindings = new HashSet<Binding>();
- Binding aaMdBinding = new Binding(
"http://localhost:"+_port+"/repo/a/a/maven-metadata.xml";, temp, true );
+ Binding aaMdBinding = new Binding( new
URL("http://localhost:"+_port+"/repo/a/a/maven-metadata.xml";), temp);
bindings.add( aaMdBinding );
_request.setBindings(bindings);
@@ -70,7 +71,7 @@
RetrievalResponse response = _retriever.retrieve(_request);
if( response.hasExceptions() )
- fail("retrieval exceptions: "+response.getExceptions()+"\nReading from
"+aaMdBinding.getRemoteUrl() );
+ fail("retrieval exceptions: "+response.getExceptions()+"\nReading from
"+aaMdBinding.getRemoteResource() );
Metadata mmd = _reader.read( new FileInputStream( temp ) );
temp.delete();
Modified:
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/client/JettyDeployerTest.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/client/JettyDeployerTest.java?rev=680912&r1=680911&r2=680912&view=diff
==============================================================================
---
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/client/JettyDeployerTest.java
(original)
+++
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/client/JettyDeployerTest.java
Tue Jul 29 22:30:41 2008
@@ -19,30 +19,27 @@
package org.apache.maven.mercury.spi.http.client;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStreamReader;
+import java.io.LineNumberReader;
+import java.io.OutputStream;
+import java.net.URL;
+import java.util.HashSet;
+import java.util.Set;
+
import junit.framework.TestCase;
-import org.apache.maven.mercury.spi.http.client.Binding;
-import org.apache.maven.mercury.spi.http.client.MercuryException;
import org.apache.maven.mercury.spi.http.client.deploy.DefaultDeployer;
import org.apache.maven.mercury.spi.http.client.deploy.DeployRequest;
import org.apache.maven.mercury.spi.http.client.deploy.DeployResponse;
-import org.apache.maven.mercury.spi.http.server.SecurePutServer;
import org.apache.maven.mercury.spi.http.server.SimplePutServer;
import org.apache.maven.mercury.spi.http.validate.Validator;
import org.apache.maven.mercury.transport.SHA1VerifierFactory;
+import org.apache.maven.mercury.transport.api.Binding;
import org.apache.maven.mercury.transport.api.StreamObserverFactory;
-import org.mortbay.jetty.Server;
import org.mortbay.util.IO;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStreamReader;
-import java.io.LineNumberReader;
-import java.io.OutputStream;
-import java.net.URL;
-import java.util.HashSet;
-import java.util.Set;
-
public class JettyDeployerTest extends TestCase
{
public String _HOST_FRAGMENT = "http://localhost:";;
@@ -57,12 +54,7 @@
File _file3;
File _file4;
File _file5;
- Binding _binding0 = new Binding();
- Binding _binding1 = new Binding();
- Binding _binding2 = new Binding();
- Binding _binding3 = new Binding();
- Binding _binding4 = new Binding();
- Binding _binding5 = new Binding();
+
org.apache.maven.mercury.transport.api.Server remoteServerType;
HashSet<StreamObserverFactory> factories;
@@ -155,22 +147,15 @@
_file3 = new File(_baseDir, "file3.jar");
_file4 = new File(_baseDir, "file4.so");
_file5 = new File(_baseDir, "file5.jpg");
-
-
_binding0.setRemoteUrl(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file0.txt");
- _binding0.setLocalFile(_file0);
- bindings.add(_binding0);
-
-
_binding3.setRemoteUrl(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file3.jar");
- _binding3.setLocalFile(_file3);
- bindings.add(_binding3);
-
-
_binding4.setRemoteUrl(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file4.so");
- _binding4.setLocalFile(_file4);
- bindings.add(_binding4);
-
-
_binding5.setRemoteUrl(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file5.jpg");
- _binding5.setLocalFile(_file5);
- bindings.add(_binding5);
+ Binding binding0 = new Binding(new
URL(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file0.txt"), _file0);
+ Binding binding3 = new Binding(new
URL(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file3.jar"), _file3);
+ Binding binding4 = new Binding(new
URL(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file4.so"), _file4);
+ Binding binding5 = new Binding(new
URL(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file5.jpg"), _file5);
+
+ bindings.add(binding0);
+ bindings.add(binding3);
+ bindings.add(binding4);
+ bindings.add(binding5);
request.setBindings(bindings);
@@ -215,25 +200,25 @@
_file4 = new File(_baseDir, "file4.so");
_file5 = new File(_baseDir, "file5.jpg");
-
_binding0.setRemoteUrl(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file0.txt");
+
_binding0.setRemoteResource(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file0.txt");
_binding0.setLocalFile(_file0);
bindings.add(_binding0);
//TODO Test Lenient
-
_binding1.setRemoteUrl(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file1.txt"); //has
no sha file
+
_binding1.setRemoteResource(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file1.txt");
//has no sha file
_binding1.setLocalFile(_file1);
//_binding1.setLenientChecksum(true);
bindings.add(_binding1);
-
_binding3.setRemoteUrl(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file3.jar");
+
_binding3.setRemoteResource(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file3.jar");
_binding3.setLocalFile(_file3);
bindings.add(_binding3);
-
_binding4.setRemoteUrl(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file4.so");
+
_binding4.setRemoteResource(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file4.so");
_binding4.setLocalFile(_file4);
bindings.add(_binding4);
-
_binding5.setRemoteUrl(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file5.jpg");
+
_binding5.setRemoteResource(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file5.jpg");
_binding5.setLocalFile(_file5);
bindings.add(_binding5);
@@ -291,30 +276,22 @@
File file6 = new File(_baseDir, "file6.txt");//doesn't exist
File file7 = new File(_baseDir, "file7.txt");//doesn't exist
-
_binding0.setRemoteUrl(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file0.txt");
- _binding0.setLocalFile(_file0);
- bindings.add(_binding0);
+ Binding binding0 = new Binding(new
URL(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file0.txt"), _file0);
+ bindings.add(binding0);
-
_binding3.setRemoteUrl(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file3.jar");
- _binding3.setLocalFile(_file3);
- bindings.add(_binding3);
+ Binding binding3 = new Binding(new
URL(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file3.jar"), _file3);
+ bindings.add(binding3);
-
_binding4.setRemoteUrl(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file4.so");
- _binding4.setLocalFile(_file4);
- bindings.add(_binding4);
+ Binding binding4 = new Binding(new
URL(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file4.so"), _file4);
+ bindings.add(binding4);
-
_binding5.setRemoteUrl(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file5.jpg");
- _binding5.setLocalFile(_file5);
- bindings.add(_binding5);
+ Binding binding5 = new Binding(new
URL(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file5.jpg"), _file5);
+ bindings.add(binding5);
- Binding binding6 = new Binding();
-
binding6.setRemoteUrl(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file6.txt");
- binding6.setLocalFile(file6);
+ Binding binding6 = new Binding(new
URL(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file6.txt"), file6);
bindings.add(binding6);
- Binding binding7 = new Binding();
-
binding6.setRemoteUrl(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file7.txt");
- binding6.setLocalFile(file7);
+ Binding binding7 = new Binding(new
URL(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file7.txt"), file7);
bindings.add(binding7);
request.setBindings(bindings);
@@ -373,30 +350,22 @@
File file6 = new File(_baseDir, "file6.txt");//doesn't exist
File file7 = new File(_baseDir, "file7.txt");//doesn't exist
-
_binding0.setRemoteUrl(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file0.txt");
- _binding0.setLocalFile(_file0);
- bindings.add(_binding0);
+ Binding binding0 = new Binding(new
URL(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file0.txt"), _file0);
+ bindings.add(binding0);
-
_binding3.setRemoteUrl(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file3.jar");
- _binding3.setLocalFile(_file3);
- bindings.add(_binding3);
+ Binding binding3 = new Binding(new
URL(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file3.jar"), _file3);
+ bindings.add(binding3);
-
_binding4.setRemoteUrl(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file4.so");
- _binding4.setLocalFile(_file4);
- bindings.add(_binding4);
+ Binding binding4 = new Binding(new
URL(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file4.so"), _file4);
+ bindings.add(binding4);
-
_binding5.setRemoteUrl(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file5.jpg");
- _binding5.setLocalFile(_file5);
- bindings.add(_binding5);
+ Binding binding5 = new Binding(new
URL(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file5.jpg"), _file5);
+ bindings.add(binding5);
- Binding binding6 = new Binding();
-
binding6.setRemoteUrl(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file6.txt");
- binding6.setLocalFile(file6);
+ Binding binding6 = new Binding(new
URL(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file6.txt"), file6);
bindings.add(binding6);
- Binding binding7 = new Binding();
-
binding6.setRemoteUrl(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file7.txt");
- binding6.setLocalFile(file7);
+ Binding binding7 = new Binding(new
URL(_HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file7.txt"), file7);
bindings.add(binding7);
request.setBindings(bindings);
Modified:
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/client/JettyRetrieverTest.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/client/JettyRetrieverTest.java?rev=680912&r1=680911&r2=680912&view=diff
==============================================================================
---
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/client/JettyRetrieverTest.java
(original)
+++
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/client/JettyRetrieverTest.java
Tue Jul 29 22:30:41 2008
@@ -32,6 +32,7 @@
import org.apache.maven.mercury.spi.http.server.SimpleTestServer;
import org.apache.maven.mercury.spi.http.validate.Validator;
import org.apache.maven.mercury.transport.SHA1VerifierFactory;
+import org.apache.maven.mercury.transport.api.Binding;
import org.apache.maven.mercury.transport.api.Server;
import org.apache.maven.mercury.transport.api.StreamObserverFactory;
@@ -155,28 +156,22 @@
file3 = new File(dir, "file3.jar");
file4 = new File(dir, "file4.so");
file5 = new File(dir, "file5.jpg");
-
binding0.setRemoteUrl(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file0.txt");
- binding0.setLocalFile(file0);
+ Binding binding0 = new Binding(new
URL(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file0.txt"), file0);
bindings.add(binding0);
-
binding1.setRemoteUrl(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file1.txt"); //has
no sha file
- binding1.setLocalFile(file1);
+ Binding binding1 = new Binding(new
URL(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file1.txt"),file1); //has no sha file
bindings.add(binding1);
-
binding2.setRemoteUrl(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file2.txt"); //has
wrong sha file
- binding2.setLocalFile(file2);
+ Binding binding2 = new Binding(new
URL(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file2.txt"), file2); //has wrong sha
file
bindings.add(binding2);
-
binding3.setRemoteUrl(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file3.jar");
- binding3.setLocalFile(file3);
+ Binding binding3 = new Binding(new
URL(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file3.jar"), file3);
bindings.add(binding3);
-
binding4.setRemoteUrl(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file4.so");
- binding4.setLocalFile(file4);
+ Binding binding4 = new Binding(new
URL(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file4.so"), file4);
bindings.add(binding4);
-
binding5.setRemoteUrl(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file5.jpg");
- binding5.setLocalFile(file5);
+ Binding binding5 = new Binding(new
URL(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file5.jpg"), file5);
bindings.add(binding5);
request.setBindings(bindings);
@@ -214,28 +209,23 @@
file3 = new File(dir, "file3.jar");
file4 = new File(dir, "file4.so");
file5 = new File(dir, "file5.jpg");
-
binding0.setRemoteUrl(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file0.txt");
- binding0.setLocalFile(file0);
+
+ Binding binding0 = new Binding(new
URL(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file0.txt"), file0);
bindings.add(binding0);
-
binding1.setRemoteUrl(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file1.txt"); //has
no sha file
- binding1.setLocalFile(file1);
+ Binding binding1 = new Binding(new
URL(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file1.txt"), file1); //has no sha
file
bindings.add(binding1);
-
binding2.setRemoteUrl(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file2.txt"); //has
wrong sha file
- binding2.setLocalFile(file2);
+ Binding binding2 = new Binding(new
URL(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file2.txt"), file2); //has wrong sha
file
bindings.add(binding2);
-
binding3.setRemoteUrl(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file3.jar");
- binding3.setLocalFile(file3);
+ Binding binding3 = new Binding(new
URL(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file3.jar"), file3);
bindings.add(binding3);
-
binding4.setRemoteUrl(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file4.so");
- binding4.setLocalFile(file4);
+ Binding binding4 = new Binding(new
URL(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file4.so"), file4);
bindings.add(binding4);
-
binding5.setRemoteUrl(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file5.jpg");
- binding5.setLocalFile(file5);
+ Binding binding5 = new Binding(new
URL(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file5.jpg"), file5);
bindings.add(binding5);
@@ -277,28 +267,22 @@
file3 = new File(dir, "file3.jar");
file4 = new File(dir, "file4.so");
file5 = new File(dir, "file5.jpg");
-
binding0.setRemoteUrl(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file0.txt");
- binding0.setLocalFile(file0);
+ Binding binding0 = new Binding(new
URL(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file0.txt"), file0);
bindings.add(binding0);
-
binding1.setRemoteUrl(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file1.txt"); //has
no sha file
- binding1.setLocalFile(file1);
+ Binding binding1 = new Binding(new
URL(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file1.txt"), file1); //has no sha
file
bindings.add(binding1);
-
binding2.setRemoteUrl(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file2.txt"); //has
wrong sha file
- binding2.setLocalFile(file2);
+ Binding binding2 = new Binding(new
URL(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file2.txt"), file2); //has wrong sha
file
bindings.add(binding2);
-
binding3.setRemoteUrl(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file3.jar");
- binding3.setLocalFile(file3);
+ Binding binding3 = new Binding(new
URL(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file3.jar"),file3 );
bindings.add(binding3);
-
binding4.setRemoteUrl(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file4.so");
- binding4.setLocalFile(file4);
+ Binding binding4 = new Binding(new
URL(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file4.so"), file4);
bindings.add(binding4);
-
binding5.setRemoteUrl(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file5.jpg");
- binding5.setLocalFile(file5);
+ Binding binding5 = new Binding(new
URL(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file5.jpg"), file5);
bindings.add(binding5);
request.setBindings(bindings);
@@ -331,24 +315,19 @@
file3 = new File(dir, "file3.jar");
file4 = new File(dir, "file4.so");
file5 = new File(dir, "file5.jpg");
-
binding0.setRemoteUrl(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file0.txt");
- binding0.setLocalFile(file0);
+ Binding binding0 = new Binding(new
URL(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file0.txt"), file0);
bindings.add(binding0);
-
binding1.setRemoteUrl(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file1.txt"); //has
no sha file
- binding1.setLocalFile(file1);
+ Binding binding1 = new Binding(new
URL(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file1.txt"), file1); //has no sha
file
bindings.add(binding1);
-
binding3.setRemoteUrl(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file3.jar");
- binding3.setLocalFile(file3);
+ Binding binding3 = new Binding(new
URL(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file3.jar"), file3);
bindings.add(binding3);
-
binding4.setRemoteUrl(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file4.so");
- binding4.setLocalFile(file4);
+ Binding binding4 = new Binding(new
URL(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file4.so"), file4);
bindings.add(binding4);
-
binding5.setRemoteUrl(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file5.jpg");
- binding5.setLocalFile(file5);
+ Binding binding5 = new Binding(new
URL(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file5.jpg"), file5);
bindings.add(binding5);
request.setBindings(bindings);
@@ -387,24 +366,20 @@
file3 = new File(dir, "file3.jar");
file4 = new File(dir, "file4.so");
file5 = new File(dir, "file5.jpg");
-
binding0.setRemoteUrl(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file0.txt");
- binding0.setLocalFile(file0);
+
+ Binding binding0 = new Binding(new
URL(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file0.txt"), file0);
bindings.add(binding0);
-
binding1.setRemoteUrl(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file1.txt"); //has
no sha file
- binding1.setLocalFile(file1);
+ Binding binding1 = new Binding(new
URL(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file1.txt"), file1); //has no sha
file
bindings.add(binding1);
-
binding3.setRemoteUrl(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file3.jar");
- binding3.setLocalFile(file3);
+ Binding binding3 = new Binding(new
URL(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file3.jar"), file3);
bindings.add(binding3);
-
binding4.setRemoteUrl(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file4.so");
- binding4.setLocalFile(file4);
+ Binding binding4 = new Binding(new
URL(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file4.so"), file4);
bindings.add(binding4);
-
binding5.setRemoteUrl(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file5.jpg");
- binding5.setLocalFile(file5);
+ Binding binding5 = new Binding(new
URL(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file5.jpg"), file5);
bindings.add(binding5);
request.setFailFast(false);
@@ -443,24 +418,20 @@
file3 = new File(dir, "file3.jar");
file4 = new File(dir, "file4.so");
file5 = new File(dir, "file5.jpg");
-
binding0.setRemoteUrl(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file0.txt");
- binding0.setLocalFile(file0);
+
+ Binding binding0 = new Binding(new
URL(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file0.txt"), file0);
bindings.add(binding0);
-
binding1.setRemoteUrl(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file1.txt"); //has
no sha file
- binding1.setLocalFile(file1);
+ Binding binding1 = new Binding(new
URL(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file1.txt"), file1); //has no sha
file
bindings.add(binding1);
-
binding3.setRemoteUrl(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file3.jar");
- binding3.setLocalFile(file3);
+ Binding binding3 = new Binding(new
URL(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file3.jar"), file3);
bindings.add(binding3);
-
binding4.setRemoteUrl(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file4.so");
- binding4.setLocalFile(file4);
+ Binding binding4 = new Binding(new
URL(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file4.so"), file4);
bindings.add(binding4);
-
binding5.setRemoteUrl(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file5.jpg");
- binding5.setLocalFile(file5);
+ Binding binding5 = new Binding(new
URL(__HOST_FRAGMENT+_port+__PATH_FRAGMENT+"file5.jpg"), file5);
bindings.add(binding5);
request.setFailFast(false);
