Author: ogusakov
Date: Thu Jul 31 12:50:41 2008
New Revision: 681457
URL: http://svn.apache.org/viewvc?rev=681457&view=rev
Log:
added Credentials, server security attributes
Added:
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryM2OperationException.java
(contents, props changed)
- copied, changed from r681188,
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderException.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/transport/api/Credentials.java
Removed:
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderException.java
Modified:
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/RepositoryWriter.java
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/transport/api/Server.java
Modified:
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/RepositoryWriter.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/RepositoryWriter.java?rev=681457&r1=681456&r2=681457&view=diff
==============================================================================
---
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/RepositoryWriter.java
(original)
+++
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/RepositoryWriter.java
Thu Jul 31 12:50:41 2008
@@ -1,10 +1,12 @@
package org.apache.maven.mercury.repository.api;
+import java.util.Collection;
+
import org.apache.maven.mercury.artifact.Artifact;
/**
- * Repository wruter API to be implemented by any repo implementation that
wishes
+ * Repository writer API to be implemented by any repo implementation that
wishes
* to store artifacts for Maven. All operations are asynchronous and can
generate
* callback events
*
@@ -22,6 +24,6 @@
* @param artifact to upload
* @throws RepositoryException
*/
- public void writeArtifact( Artifact artifact, RepositoryCallback callback )
+ public void writeArtifact( Collection<Artifact> artifact )
throws RepositoryException;
}
Copied:
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryM2OperationException.java
(from r681188,
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderException.java)
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryM2OperationException.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryM2OperationException.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderException.java&r1=681188&r2=681457&rev=681457&view=diff
==============================================================================
---
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderException.java
(original)
+++
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryM2OperationException.java
Thu Jul 31 12:50:41 2008
@@ -9,14 +9,14 @@
* @version $Id$
*
*/
-public class RemoteRepositoryReaderException
+public class RemoteRepositoryM2OperationException
extends RepositoryException
{
/**
*
*/
- public RemoteRepositoryReaderException()
+ public RemoteRepositoryM2OperationException()
{
// TODO Auto-generated constructor stub
}
@@ -24,7 +24,7 @@
/**
* @param message
*/
- public RemoteRepositoryReaderException(
+ public RemoteRepositoryM2OperationException(
String message )
{
super( message );
@@ -34,7 +34,7 @@
/**
* @param cause
*/
- public RemoteRepositoryReaderException(
+ public RemoteRepositoryM2OperationException(
Throwable cause )
{
super( cause );
@@ -45,7 +45,7 @@
* @param message
* @param cause
*/
- public RemoteRepositoryReaderException(
+ public RemoteRepositoryM2OperationException(
String message,
Throwable cause )
{
Propchange:
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryM2OperationException.java
------------------------------------------------------------------------------
svn:mergeinfo =
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=681457&r1=681456&r2=681457&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
Thu Jul 31 12:50:41 2008
@@ -38,7 +38,7 @@
* implementation of M2 remote repository reader. Actual Transport used comes
from RemoteRepository Server' URL
*
* Current implementation does not do the check and uses jetty-client
directly.
- * TODO - re-implements after jetty-client implements Transport
+ * TODO - re-implements after jetty-client implements ReaderTransport
*
*
* @author Oleg Gusakov
@@ -242,9 +242,11 @@
return null;
FileInputStream fis = null;
+ File tempFile = null;
try
{
- File tempFile = File.createTempFile( "mercury", "readraw" );
+ // transport workaround - until it can do in-memory Bindings
+ tempFile = File.createTempFile( "mercury", "readraw" );
String separator = "/";
if( path.startsWith( separator ))
@@ -274,11 +276,11 @@
finally
{
if( fis != null ) try { fis.close(); } catch( Exception any ) {}
+ if( tempFile != null ) try { if(tempFile.exists()) tempFile.delete(); }
catch( Exception any ) {}
}
}
//---------------------------------------------------------------------------------------------------------------
- public boolean canHandle(
- String protocol )
+ public boolean canHandle( String protocol )
{
return AbstractRepository.DEFAULT_REMOTE_READ_PROTOCOL.equals( protocol );
}
Added:
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/transport/api/Credentials.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/transport/api/Credentials.java?rev=681457&view=auto
==============================================================================
---
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/transport/api/Credentials.java
(added)
+++
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/transport/api/Credentials.java
Thu Jul 31 12:50:41 2008
@@ -0,0 +1,65 @@
+package org.apache.maven.mercury.transport.api;
+
+/**
+ * supplies credentials to the server
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ *
+ */
+public class Credentials
+{
+ private String user;
+ private String pass;
+
+ private byte [] cert;
+
+ public Credentials( String user, String pass )
+ {
+ this.user = user;
+ this.pass = pass;
+ }
+
+ public Credentials( byte [] cert, String user, String pass )
+ {
+ this( user, pass );
+ this.cert = cert;
+ }
+
+ public Credentials( byte [] cert )
+ {
+ this.cert = cert;
+ }
+
+ public String getUser()
+ {
+ return user;
+ }
+
+ public void setUser( String user )
+ {
+ this.user = user;
+ }
+
+ public String getPass()
+ {
+ return pass;
+ }
+
+ public void setPass( String pass )
+ {
+ this.pass = pass;
+ }
+
+ public byte [] getCertificate()
+ {
+ return cert;
+ }
+
+ public void setCertificate( byte [] cert )
+ {
+ this.cert = cert;
+ }
+
+
+}
Modified:
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/transport/api/Server.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/transport/api/Server.java?rev=681457&r1=681456&r2=681457&view=diff
==============================================================================
---
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/transport/api/Server.java
(original)
+++
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/transport/api/Server.java
Thu Jul 31 12:50:41 2008
@@ -26,6 +26,9 @@
private String id;
private Set<StreamObserverFactory> streamObserverFactories;
private URL url;
+ private Credentials serverCredentials;
+ private URL proxy;
+ private Credentials proxyCredentials;
public Server( String id, URL url )
{
@@ -33,11 +36,49 @@
this.id = id;
}
+ public Server( String id, URL url, Credentials serverCredentials )
+ {
+ this( id, url );
+ this.serverCredentials = serverCredentials;
+ }
+
+ public Server( String id, URL url, Credentials serverCredentials, URL proxy )
+ {
+ this( id, url, serverCredentials );
+ this.proxy = proxy;
+ }
+
+ public Server( String id, URL url, Credentials serverCredentials, URL proxy,
Credentials proxyCredentials )
+ {
+ this( id, url, serverCredentials, proxy );
+ this.proxyCredentials = proxyCredentials;
+ }
+
+ public String getId()
+ {
+ return id;
+ }
+
public URL getURL()
{
return this.url;
}
+ public Credentials getServerCredentials()
+ {
+ return this.serverCredentials;
+ }
+
+ public URL getProxy()
+ {
+ return this.proxy;
+ }
+
+ public Credentials getProxyCredentials()
+ {
+ return this.serverCredentials;
+ }
+
public Set<StreamObserverFactory> getStreamObserverFactories()
{
return streamObserverFactories;
@@ -48,9 +89,4 @@
streamObserverFactories = factories;
}
- public String getId()
- {
- return id;
- }
-
}
