svn commit: r681149 - in /maven/sandbox/trunk/mercury/src: main/java/org/apache/maven/mercury/transport/api/ test/java/org/apache/maven/mercury/spi/http/client/

[ogusakov]

Author: ogusakov
Date: Wed Jul 30 10:59:53 2008
New Revision: 681149

URL: http://svn.apache.org/viewvc?rev=681149&view=rev
Log:
added Server id

Modified:
    
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/transport/api/Server.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/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=681149&r1=681148&r2=681149&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
 Wed Jul 30 10:59:53 2008
@@ -23,27 +23,34 @@
 
 public class Server
 {
-    private Set<StreamObserverFactory> streamObserverFactories;
-    private URL url;
- 
-    public Server (URL url)
-    {
-        this.url = url;
-    }
-    
-    public URL getURL()
-    {
-        return this.url;
-    }
-    
-    public Set<StreamObserverFactory> getStreamObserverFactories()
-    {
-        return streamObserverFactories;
-    }
-    
-    public void setStreamObserverFactories(Set<StreamObserverFactory> 
factories)
-    {
-        streamObserverFactories = factories;
-    }
+  private String                     id;
+  private Set<StreamObserverFactory> streamObserverFactories;
+  private URL                        url;
+
+  public Server( String id, URL url )
+  {
+    this.url = url;
+    this.id = id;
+  }
+
+  public URL getURL()
+  {
+    return this.url;
+  }
+
+  public Set<StreamObserverFactory> getStreamObserverFactories()
+  {
+    return streamObserverFactories;
+  }
+
+  public void setStreamObserverFactories( Set<StreamObserverFactory> factories 
)
+  {
+    streamObserverFactories = factories;
+  }
+
+  public String getId()
+  {
+    return id;
+  }
 
 }

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=681149&r1=681148&r2=681149&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
 Wed Jul 30 10:59:53 2008
@@ -121,7 +121,7 @@
     protected void setUpVerifiers () throws Exception
     {
         HashSet<org.apache.maven.mercury.transport.api.Server> 
remoteServerTypes = new 
HashSet<org.apache.maven.mercury.transport.api.Server>();
-        remoteServerType = new 
org.apache.maven.mercury.transport.api.Server(new URL(_HOST_FRAGMENT+_port));
+        remoteServerType = new org.apache.maven.mercury.transport.api.Server( 
"test", new URL(_HOST_FRAGMENT+_port));
         factories = new HashSet<StreamObserverFactory>();       
         remoteServerTypes.add(remoteServerType);
         _deployer.setServers(remoteServerTypes);

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=681149&r1=681148&r2=681149&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
 Wed Jul 30 10:59:53 2008
@@ -107,7 +107,7 @@
         _port=String.valueOf(server.getPort()); 
         
         HashSet<Server> remoteServerTypes = new HashSet<Server>();
-        remoteServerType = new Server(new URL(__HOST_FRAGMENT+_port));
+        remoteServerType = new Server( "test", new URL(__HOST_FRAGMENT+_port));
         factories = new HashSet<StreamObserverFactory>();
             
         remoteServerTypes.add(remoteServerType);