Author: ogusakov
Date: Tue Sep 16 12:37:17 2008
New Revision: 696022
URL: http://svn.apache.org/viewvc?rev=696022&view=rev
Log:
small changes to accommodate Mercury wagon struggle with wagon APIs
Modified:
maven/sandbox/trunk/mercury/mercury-crypto/mercury-crypto-api/src/main/java/org/apache/maven/mercury/crypto/api/StreamVerifierAttributes.java
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryWriterM2.java
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Server.java
maven/sandbox/trunk/mercury/mercury-util/pom.xml
Modified:
maven/sandbox/trunk/mercury/mercury-crypto/mercury-crypto-api/src/main/java/org/apache/maven/mercury/crypto/api/StreamVerifierAttributes.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-crypto/mercury-crypto-api/src/main/java/org/apache/maven/mercury/crypto/api/StreamVerifierAttributes.java?rev=696022&r1=696021&r2=696022&view=diff
==============================================================================
---
maven/sandbox/trunk/mercury/mercury-crypto/mercury-crypto-api/src/main/java/org/apache/maven/mercury/crypto/api/StreamVerifierAttributes.java
(original)
+++
maven/sandbox/trunk/mercury/mercury-crypto/mercury-crypto-api/src/main/java/org/apache/maven/mercury/crypto/api/StreamVerifierAttributes.java
Tue Sep 16 12:37:17 2008
@@ -12,6 +12,7 @@
protected boolean isLenient = true;
protected boolean isSufficient = false;
protected String extension = "none";
+ protected String digestAlgorithm = "SHA-1";
/**
*
Modified:
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryWriterM2.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryWriterM2.java?rev=696022&r1=696021&r2=696022&view=diff
==============================================================================
---
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryWriterM2.java
(original)
+++
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryWriterM2.java
Tue Sep 16 12:37:17 2008
@@ -6,7 +6,6 @@
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
-import java.nio.channels.FileLock;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
@@ -118,7 +117,7 @@
ArtifactQueue aq = new ArtifactQueue();
LocalRepositoryWriterM2 [] workers = new LocalRepositoryWriterM2[ nWorkers
];
-
+
for( int i=0; i<nWorkers; i++ )
{
workers[ i ] = new LocalRepositoryWriterM2( _repo, _repoDir, aq );
Modified:
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Server.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Server.java?rev=696022&r1=696021&r2=696022&view=diff
==============================================================================
---
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Server.java
(original)
+++
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Server.java
Tue Sep 16 12:37:17 2008
@@ -27,10 +27,13 @@
public class Server
{
private String id;
+
private URL url;
private Credentials serverCredentials;
+
private URL proxy;
private Credentials proxyCredentials;
+
private boolean requireEncryption = false;
private boolean requireTrustedServer = false;
@@ -92,6 +95,11 @@
return this.serverCredentials;
}
+ public void setServerCredentials( Credentials cred )
+ {
+ this.serverCredentials = cred;
+ }
+
public URL getProxy()
{
return this.proxy;
@@ -101,12 +109,22 @@
{
return this.proxy != null;
}
+
+ public void setProxy( URL proxy )
+ {
+ this.proxy = proxy;
+ }
public Credentials getProxyCredentials()
{
return this.proxyCredentials;
}
+ public void setProxyCredentials( Credentials user )
+ {
+ this.proxyCredentials = user;
+ }
+
public boolean hasWriterStreamVerifierFactories()
{
return writerStreamVerifierFactories != null &&
writerStreamVerifierFactories.size() > 0;
Modified: maven/sandbox/trunk/mercury/mercury-util/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-util/pom.xml?rev=696022&r1=696021&r2=696022&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-util/pom.xml (original)
+++ maven/sandbox/trunk/mercury/mercury-util/pom.xml Tue Sep 16 12:37:17 2008
@@ -42,8 +42,10 @@
<artifactSet>
<excludes>
<exclude>org.codehaus.plexus:plexus-component-api</exclude>
+ <exclude>org.bouncycastle:bcprov-jdk15</exclude>
+ <exclude>org.bouncycastle:bcpg-jdk15</exclude>
<exclude>bouncycastle:bcprov-jdk15</exclude>
- <exclude>obouncycastle:bcpg-jdk15</exclude>
+ <exclude>bouncycastle:bcpg-jdk15</exclude>
</excludes>
</artifactSet>
<filters>
