svn commit: r705774 - in /maven/mercury/trunk/mercury-transport: mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/ mercury-transport-file/src/main/java/org/apache/maven/mercury/transport/file/ mercury-transport-http/src/main/j...

[og...@apache.org]

Author: ogusakov
Date: Fri Oct 17 16:06:36 2008
New Revision: 705774

URL: http://svn.apache.org/viewvc?rev=705774&view=rev
Log:
started moving jetty client towards implementing transport interfaces. Still have to figure out initialization as transport should be injected into repository

Added:
    maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Initializable.java
    maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/InitializationException.java
    maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/HttpWriterTransport.java
    maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/HttpReaderTransport.java
Removed:
    maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/transport/http/HttpReaderTransport.java
Modified:
    maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/AbstractTransport.java
    maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/ReaderTransport.java
    maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/WriterTransport.java
    maven/mercury/trunk/mercury-transport/mercury-transport-file/src/main/java/org/apache/maven/mercury/transport/file/FileWriterTransport.java

Modified: maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/AbstractTransport.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/AbstractTransport.java?rev=705774&r1=705773&r2=705774&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/AbstractTransport.java (original)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/AbstractTransport.java Fri Oct 17 16:06:36 2008
@@ -2,8 +2,7 @@
 
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.HashSet;
 
 /**
  * Helper parent of transport implementations. Common for read and write transports
@@ -14,30 +13,17 @@
  */
 public abstract class AbstractTransport
 {
-  private Map< String, Server > _servers = Collections.synchronizedMap( new HashMap< String, Server >(8) );
+  private Collection<Server> _servers = Collections.synchronizedSet( new HashSet< Server >() );
   
-  public void addServer( Server server )
+  public void setServers( Collection<Server> servers )
   {
-    if( server == null )
-      return;
-    
-    _servers.put( server.getId(), server );
+    _servers = servers;
   }
   
-  public void addServers( Collection<ServerContainer> containers )
+  public Collection<Server> getServers()
   {
-    for( ServerContainer c : containers )
-      addServer( c.getServer() );
-  }
-
-  public Server findServer( String id )
-  {
-    return _servers.get( id );
-  }
-
-  public void dropServer( String id )
-  {
-    _servers.remove( id );
+    return _servers;
   }
+  
 
 }

Added: maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Initializable.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Initializable.java?rev=705774&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Initializable.java (added)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Initializable.java Fri Oct 17 16:06:36 2008
@@ -0,0 +1,15 @@
+package org.apache.maven.mercury.transport.api;
+
+/**
+ *
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ *
+ */
+public interface Initializable
+{
+  public void init()
+  throws InitializationException
+  ;
+}

Added: maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/InitializationException.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/InitializationException.java?rev=705774&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/InitializationException.java (added)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/InitializationException.java Fri Oct 17 16:06:36 2008
@@ -0,0 +1,54 @@
+package org.apache.maven.mercury.transport.api;
+
+/**
+ *
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ *
+ */
+public class InitializationException
+    extends Exception
+{
+
+  /**
+   * 
+   */
+  public InitializationException()
+  {
+    // TODO Auto-generated constructor stub
+  }
+
+  /**
+   * @param message
+   */
+  public InitializationException(
+      String message )
+  {
+    super( message );
+    // TODO Auto-generated constructor stub
+  }
+
+  /**
+   * @param cause
+   */
+  public InitializationException(
+      Throwable cause )
+  {
+    super( cause );
+    // TODO Auto-generated constructor stub
+  }
+
+  /**
+   * @param message
+   * @param cause
+   */
+  public InitializationException(
+      String message,
+      Throwable cause )
+  {
+    super( message, cause );
+    // TODO Auto-generated constructor stub
+  }
+
+}

Modified: maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/ReaderTransport.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/ReaderTransport.java?rev=705774&r1=705773&r2=705774&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/ReaderTransport.java (original)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/ReaderTransport.java Fri Oct 17 16:06:36 2008
@@ -1,5 +1,7 @@
 package org.apache.maven.mercury.transport.api;
 
+import java.util.Collection;
+
 /**
  * generic Transport interface - allows client to read data from a remote repository
  *
@@ -8,7 +10,12 @@
  *
  */
 public interface ReaderTransport
+extends Initializable
 {
   public TransportTransaction read( TransportTransaction trx )
   throws TransportException;
+  
+  public void setServers( Collection<Server> servers );
+  
+  public Collection<Server> getServers();
 }

Modified: maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/WriterTransport.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/WriterTransport.java?rev=705774&r1=705773&r2=705774&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/WriterTransport.java (original)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/WriterTransport.java Fri Oct 17 16:06:36 2008
@@ -9,6 +9,7 @@
  *
  */
 public interface WriterTransport
+extends Initializable
 {
   public TransportTransaction write( TransportTransaction trx )
   throws TransportException;

Modified: maven/mercury/trunk/mercury-transport/mercury-transport-file/src/main/java/org/apache/maven/mercury/transport/file/FileWriterTransport.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-file/src/main/java/org/apache/maven/mercury/transport/file/FileWriterTransport.java?rev=705774&r1=705773&r2=705774&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-file/src/main/java/org/apache/maven/mercury/transport/file/FileWriterTransport.java (original)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-file/src/main/java/org/apache/maven/mercury/transport/file/FileWriterTransport.java Fri Oct 17 16:06:36 2008
@@ -1,5 +1,7 @@
 package org.apache.maven.mercury.transport.file;
 
+import org.apache.maven.mercury.transport.api.AbstractTransport;
+import org.apache.maven.mercury.transport.api.InitializationException;
 import org.apache.maven.mercury.transport.api.Server;
 import org.apache.maven.mercury.transport.api.TransportException;
 import org.apache.maven.mercury.transport.api.TransportTransaction;
@@ -13,7 +15,8 @@
  *
  */
 public class FileWriterTransport
-    implements WriterTransport
+extends AbstractTransport
+implements WriterTransport
 {
   protected Server server;
   
@@ -29,6 +32,16 @@
     return null;
   }
 
+  /* (non-Javadoc)
+   * @see org.apache.maven.mercury.transport.api.Initializable#init()
+   */
+  public void init()
+      throws InitializationException
+  {
+    // TODO Auto-generated method stub
+    
+  }
+
 }
 //==============================================================
 class FileWriter

Added: maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/HttpWriterTransport.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/HttpWriterTransport.java?rev=705774&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/HttpWriterTransport.java (added)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/HttpWriterTransport.java Fri Oct 17 16:06:36 2008
@@ -0,0 +1,34 @@
+package org.apache.maven.mercury.spi.http.client.deploy;
+
+import org.apache.maven.mercury.transport.api.AbstractTransport;
+import org.apache.maven.mercury.transport.api.InitializationException;
+import org.apache.maven.mercury.transport.api.TransportException;
+import org.apache.maven.mercury.transport.api.TransportTransaction;
+import org.apache.maven.mercury.transport.api.WriterTransport;
+
+/**
+ *
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ *
+ */
+public class HttpWriterTransport
+extends AbstractTransport
+implements WriterTransport
+{
+  
+  DefaultDeployer _deployer;
+
+  public TransportTransaction write( TransportTransaction trx )
+  throws TransportException
+  {
+    return null;
+  }
+
+  public void init()
+  throws InitializationException
+  {
+  }
+
+}

Added: maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/HttpReaderTransport.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/HttpReaderTransport.java?rev=705774&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/HttpReaderTransport.java (added)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/HttpReaderTransport.java Fri Oct 17 16:06:36 2008
@@ -0,0 +1,33 @@
+package org.apache.maven.mercury.spi.http.client.retrieve;
+
+import org.apache.maven.mercury.transport.api.AbstractTransport;
+import org.apache.maven.mercury.transport.api.InitializationException;
+import org.apache.maven.mercury.transport.api.ReaderTransport;
+import org.apache.maven.mercury.transport.api.TransportException;
+import org.apache.maven.mercury.transport.api.TransportTransaction;
+
+/**
+ * HTTP retriever adaptor: adopts DefaultRetriever to ReaderTransport API
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ *
+ */
+public class HttpReaderTransport
+extends AbstractTransport
+implements ReaderTransport
+{
+  private DefaultRetriever _retriever;
+  
+  public TransportTransaction read( TransportTransaction trx )
+  throws TransportException
+  {
+    return null;
+  }
+
+  public void init()
+  throws InitializationException
+  {
+  }
+
+}