maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ogusa...@apache.org
Subject svn commit: r747226 [2/2] - in /maven/mercury/trunk: ./ mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ mercury-ant-tasks/src/main/resources/org/apache/maven/mercury/ant/tasks/ mercury-ant-tasks/src/site/apt/ mercury-it/src/test/jav...
Date Tue, 24 Feb 2009 00:02:45 GMT
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryM2.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryM2.java?rev=747226&r1=747225&r2=747226&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryM2.java
(original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryM2.java
Tue Feb 24 00:02:44 2009
@@ -28,107 +28,134 @@
 import org.apache.maven.mercury.repository.api.RepositoryUpdatePolicy;
 import org.apache.maven.mercury.repository.api.RepositoryWriter;
 import org.apache.maven.mercury.transport.api.Server;
-
+import org.codehaus.plexus.lang.DefaultLanguage;
+import org.codehaus.plexus.lang.Language;
 
 public class RemoteRepositoryM2
-extends AbstractRepository
-implements RemoteRepository
+    extends AbstractRepository
+    implements RemoteRepository
 {
-  public static final String METADATA_FILE_NAME = "maven-metadata.xml";
-  
-  private Server _server;
-  
-  protected boolean _workAroundBadMetadata = true;
-    
+    private static final Language _LANG = new DefaultLanguage( RemoteRepositoryReaderM2.class
);
+
+    public static final String METADATA_FILE_NAME = "maven-metadata.xml";
+
+    private Server _server;
+
+    protected boolean _workAroundBadMetadata = true;
+
     /** default update policy */
-    private RepositoryUpdatePolicy _updatePolicy = new RepositoryUpdateIntervalPolicy( RepositoryUpdateIntervalPolicy.DEFAULT_UPDATE_POLICY
);
-    
-    //----------------------------------------------------------------------------------
-    public RemoteRepositoryM2( Server server, DependencyProcessor dependencyProcessor  )
+    private RepositoryUpdatePolicy _updatePolicy =
+        new RepositoryUpdateIntervalPolicy( RepositoryUpdateIntervalPolicy.DEFAULT_UPDATE_POLICY
);
+
+    // ----------------------------------------------------------------------------------
+    public RemoteRepositoryM2( String url, DependencyProcessor dependencyProcessor )
     {
-      this( server.getId(), server, dependencyProcessor );
+        super( Server.normalizeUrl( url ), DEFAULT_REPOSITORY_TYPE );
+        this._server = server;
+        setDependencyProcessor( dependencyProcessor );
+    }
+
+    // ----------------------------------------------------------------------------------
+    public RemoteRepositoryM2( Server server, DependencyProcessor dependencyProcessor )
+    {
+        this( server.getURL().toString(), server, dependencyProcessor );
     }
-    //----------------------------------------------------------------------------------
-    public RemoteRepositoryM2( String id, Server server, DependencyProcessor dependencyProcessor
 )
+
+    // ----------------------------------------------------------------------------------
+    public RemoteRepositoryM2( String id, Server server, DependencyProcessor dependencyProcessor
)
     {
         super( id, DEFAULT_REPOSITORY_TYPE );
         this._server = server;
         setDependencyProcessor( dependencyProcessor );
     }
-    //----------------------------------------------------------------------------------
+
+    // ----------------------------------------------------------------------------------
     public Server getServer()
     {
         return _server;
     }
-    //----------------------------------------------------------------------------------
+
+    // ----------------------------------------------------------------------------------
     public RepositoryReader getReader()
-    throws RepositoryException
+        throws RepositoryException
     {
-      return new RemoteRepositoryReaderM2( this, getDependencyProcessor() );
+        return new RemoteRepositoryReaderM2( this, getDependencyProcessor() );
     }
-    //----------------------------------------------------------------------------------
+
+    // ----------------------------------------------------------------------------------
     public RepositoryReader getReader( String protocol )
-    throws RepositoryException
+        throws RepositoryException
     {
-      return getReader();
+        return getReader();
     }
-    //----------------------------------------------------------------------------------
+
+    // ----------------------------------------------------------------------------------
     public RepositoryWriter getWriter()
-    throws RepositoryException
+        throws RepositoryException
     {
-      return new RemoteRepositoryWriterM2(this);
+        return new RemoteRepositoryWriterM2( this );
     }
-    //----------------------------------------------------------------------------------
+
+    // ----------------------------------------------------------------------------------
     public RepositoryWriter getWriter( String protocol )
         throws NonExistentProtocolException
     {
-      // TODO Auto-generated method stub
-      return null;
+        // TODO Auto-generated method stub
+        return null;
     }
-    //----------------------------------------------------------------------------------
+
+    // ----------------------------------------------------------------------------------
     public boolean isLocal()
     {
-     return false;
+        return false;
     }
-    //----------------------------------------------------------------------------------
+
+    // ----------------------------------------------------------------------------------
     public boolean isReadable()
     {
-      return true;
+        return true;
     }
-    //----------------------------------------------------------------------------------
+
+    // ----------------------------------------------------------------------------------
     public boolean isWriteable()
     {
-      return true;
+        return true;
     }
-    //----------------------------------------------------------------------------------
+
+    // ----------------------------------------------------------------------------------
     public boolean isWorkAroundBadMetadata()
     {
         return _workAroundBadMetadata;
     }
-    //----------------------------------------------------------------------------------
+
+    // ----------------------------------------------------------------------------------
     public void setWorkAroundBadMetadata( boolean aroundBadMetadata )
     {
         _workAroundBadMetadata = aroundBadMetadata;
     }
-    //----------------------------------------------------------------------------------
+
+    // ----------------------------------------------------------------------------------
     public String getType()
     {
-      return DEFAULT_REPOSITORY_TYPE;
+        return DEFAULT_REPOSITORY_TYPE;
     }
-    //----------------------------------------------------------------------------------
+
+    // ----------------------------------------------------------------------------------
     public RepositoryUpdatePolicy getUpdatePolicy()
     {
-      return _updatePolicy;
+        return _updatePolicy;
     }
-    //----------------------------------------------------------------------------------
+
+    // ----------------------------------------------------------------------------------
     public void setUpdatePolicy( RepositoryUpdatePolicy updatePolicy )
     {
-      this._updatePolicy = updatePolicy;
+        this._updatePolicy = updatePolicy;
     }
-    //----------------------------------------------------------------------------------
+
+    // ----------------------------------------------------------------------------------
     public String getMetadataName()
     {
-      return METADATA_FILE_NAME;
+        return METADATA_FILE_NAME;
     }
-    //----------------------------------------------------------------------------------
+    // ----------------------------------------------------------------------------------
 }

Modified: maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java?rev=747226&r1=747225&r2=747226&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java
(original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java
Tue Feb 24 00:02:44 2009
@@ -66,10 +66,14 @@
     String _artifactCoordLatest = "org.apache.maven.mercury:mercury-repo-virtual:1.0.0-alpha-2-LATEST";
 
     String _artifactCoordRelease = "ant:ant:1.6.5";
+    
+    String LOCAL_REPO_ID = "localRepo";
 
-    String _localRepoId = "localRepo";
+    String _localRepoId;
 
-    String _remoteRepoId = "remoteRepo";
+    String REMOTE_REPO_ID = "remoteRepo";
+
+    String _remoteRepoId;
 
     HttpTestServer _jetty;
 
@@ -104,14 +108,18 @@
             throw new Exception( "cannot create clean folder " + _testBase.getAbsolutePath()
);
         }
 
-        _localRepo = new LocalRepositoryM2( _localRepoId, _testBase, new MetadataProcessorMock()
);
+        _localRepo = new LocalRepositoryM2( LOCAL_REPO_ID, _testBase, new MetadataProcessorMock()
);
+        
+        _localRepoId = _localRepo.getId();
 
         _jetty = new HttpTestServer( _remoteRepoBase, "/repo" );
         _jetty.start();
         _port = String.valueOf( _jetty.getPort() );
-        Server server = new Server( _remoteRepoId, new URL( "http://localhost:" + _port +
"/repo" ) );
+        Server server = new Server( REMOTE_REPO_ID, new URL( "http://localhost:" + _port
+ "/repo" ) );
 
-        _remoteRepo = new RemoteRepositoryM2( server.getId(), server, new MetadataProcessorMock()
);
+        _remoteRepo = new RemoteRepositoryM2( server, new MetadataProcessorMock() );
+        
+        _remoteRepoId = _remoteRepo.getId();
 
         if ( Util.isWindows() )
         {
@@ -123,6 +131,8 @@
         rl.add( _remoteRepo );
 
         _vr = new VirtualRepositoryReader( rl );
+        
+        
     }
 
     @Override

Added: maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Messages.properties
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Messages.properties?rev=747226&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Messages.properties
(added)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Messages.properties
Tue Feb 24 00:02:44 2009
@@ -0,0 +1,20 @@
+#
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#
+
+repo.null.url.normalize=cannot normalize (or even have) null url.

Propchange: maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Messages.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Messages.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Server.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Server.java?rev=747226&r1=747225&r2=747226&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Server.java
(original)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Server.java
Tue Feb 24 00:02:44 2009
@@ -24,217 +24,255 @@
 
 import org.apache.maven.mercury.crypto.api.StreamObserverFactory;
 import org.apache.maven.mercury.crypto.api.StreamVerifierFactory;
+import org.codehaus.plexus.lang.DefaultLanguage;
+import org.codehaus.plexus.lang.Language;
 
 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;
-
-  private Set<StreamObserverFactory>  writerStreamObserverFactories;
-  private Set<StreamObserverFactory>  readerStreamObserverFactories;
-
-  private Set<StreamVerifierFactory>  writerStreamVerifierFactories;
-  private Set<StreamVerifierFactory>  readerStreamVerifierFactories;
-  
-  private String                      userAgent;
-  
-  public Server( String id, URL url )
-  {
-    if( url == null )
-      throw new IllegalArgumentException( "URL: "+url );
-    
-    String ustr = url.toString();
-    
-    if( ustr.endsWith( "/" ) )
-      try
-      {
-        this.url = new URL( ustr.substring( 0, ustr.length()-1 ) );
-      }
-      catch( MalformedURLException e )
-      {
-        throw new IllegalArgumentException( e.getMessage() );
-      }
-    else
-      this.url = url;
-    
-    this.id = id;
-  }
-
-  public Server( String id, URL url, boolean requireEncryption, boolean requireTrustedServer
)
-  {
-    this( id, url );
-    
-    this.requireEncryption = requireEncryption;
-    this.requireTrustedServer = requireTrustedServer;
-  }
-
-  public Server( String id, URL url, boolean requireEncryption, boolean requireTrustedServer,
Credentials serverCredentials )
-  {
-    this( id, url, requireEncryption, requireTrustedServer );
-    this.serverCredentials = serverCredentials;
-  }
-
-  public Server( String id, URL url, boolean requireEncryption, boolean requireTrustedServer,
Credentials serverCredentials, URL proxy )
-  {
-    this( id, url, requireEncryption, requireTrustedServer, serverCredentials );
-    this.proxy = proxy;
-  }
-
-  public Server( String id, URL url, boolean requireEncryption, boolean requireTrustedServer,
Credentials serverCredentials, URL proxy, Credentials proxyCredentials )
-  {
-    this( id, url, requireEncryption, requireTrustedServer, serverCredentials, proxy );
-    this.proxyCredentials = proxyCredentials;
-  }
-
-  public String getId()
-  {
-    return id;
-  }
-
-  public boolean hasUserAgent()
-  {
-    return userAgent != null;
-  }
-
-  public String getUserAgent()
-  {
-    return userAgent;
-  }
-
-  public void setUserAgent( String userAgent )
-  {
-    this.userAgent = userAgent;
-  }
-
-  public void setURL( URL url )
-  {
-    this.url = url;
-  }
-
-  public URL getURL()
-  {
-    return this.url;
-  }
-
-  public Credentials getServerCredentials()
-  {
-    return this.serverCredentials;
-  }
-
-  public void setServerCredentials( Credentials cred )
-  {
-    this.serverCredentials = cred;
-  }
-
-  public URL getProxy()
-  {
-    return this.proxy;
-  }
-
-  public boolean hasProxy()
-  {
-    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;
-  }
-
-  public Set<StreamVerifierFactory> getWriterStreamVerifierFactories()
-  {
-    return writerStreamVerifierFactories;
-  }
-
-  public void setWriterStreamVerifierFactories( Set<StreamVerifierFactory> factories
)
-  {
-    writerStreamVerifierFactories = factories;
-  }
-
-  public boolean hasReaderStreamVerifierFactories()
-  {
-    return readerStreamVerifierFactories != null && readerStreamVerifierFactories.size()
> 0;
-  }
-
-  public Set<StreamVerifierFactory> getReaderStreamVerifierFactories()
-  {
-    return readerStreamVerifierFactories;
-  }
-
-  public void setReaderStreamVerifierFactories( Set<StreamVerifierFactory> factories
)
-  {
-    readerStreamVerifierFactories = factories;
-  }
-
-  public boolean hasWriterStreamObserverFactories()
-  {
-    return writerStreamObserverFactories != null && writerStreamObserverFactories.size()
> 0;
-  }
-
-  public Set<StreamObserverFactory> getWriterStreamObserverFactories()
-  {
-    return writerStreamObserverFactories;
-  }
-
-  public void setWriterStreamObserverFactories( Set<StreamObserverFactory> factories
)
-  {
-    writerStreamObserverFactories = factories;
-  }
-
-  public boolean hasReaderStreamObserverFactories()
-  {
-    return readerStreamObserverFactories != null && readerStreamObserverFactories.size()
> 0;
-  }
-
-  public Set<StreamObserverFactory> getReaderStreamObserverFactories()
-  {
-    return readerStreamObserverFactories;
-  }
-
-  public void setReaderStreamObserverFactories( Set<StreamObserverFactory> factories
)
-  {
-    readerStreamObserverFactories = factories;
-  }
-
-  public boolean isRequireEncryption()
-  {
-    return requireEncryption;
-  }
-  
-  public boolean isRequireTrustedServer()
-  {
-    return requireTrustedServer;
-  }
-
-  @Override
-  public String toString()
-  {
-    return id+": "+url;
-  }
-  
-  
+    private static final Language _LANG = new DefaultLanguage( Server.class );
+
+    private String id;
+
+    private URL url;
+
+    private Credentials serverCredentials;
+
+    private URL proxy;
+
+    private Credentials proxyCredentials;
+
+    private boolean requireEncryption = false;
+
+    private boolean requireTrustedServer = false;
+
+    private Set<StreamObserverFactory> writerStreamObserverFactories;
+
+    private Set<StreamObserverFactory> readerStreamObserverFactories;
+
+    private Set<StreamVerifierFactory> writerStreamVerifierFactories;
+
+    private Set<StreamVerifierFactory> readerStreamVerifierFactories;
+
+    private String userAgent;
+
+    public static String normalizeUrl( String url )
+    {
+        if ( url == null )
+            throw new IllegalArgumentException( _LANG.getMessage( "repo.null.url.normalize"
) );
+
+        int pos = url.indexOf( "://" );
+
+        StringBuilder sb = new StringBuilder();
+
+        if ( pos == -1 )
+            sb.append( url );
+        else
+            sb.append( url.substring( pos + 3 ) );
+
+        int len = sb.length();
+
+        if ( len > 0 && sb.charAt( len - 1 ) == '/' )
+            sb.deleteCharAt( len - 1 );
+
+        return sb.toString();
+    }
+
+    public Server( URL url )
+    {
+        if ( url == null )
+            throw new IllegalArgumentException( "URL: " + url );
+
+        String ustr = url.toString();
+
+        if ( ustr.endsWith( "/" ) )
+            try
+            {
+                this.url = new URL( ustr.substring( 0, ustr.length() - 1 ) );
+            }
+            catch ( MalformedURLException e )
+            {
+                throw new IllegalArgumentException( e.getMessage() );
+            }
+        else
+            this.url = url;
+        
+    }
+
+    public Server( String id, URL url )
+    {
+        this( url );
+
+        this.id = id;
+    }
+
+    public Server( String id, URL url, boolean requireEncryption, boolean requireTrustedServer
)
+    {
+        this( id, url );
+
+        this.requireEncryption = requireEncryption;
+        this.requireTrustedServer = requireTrustedServer;
+    }
+
+    public Server( String id, URL url, boolean requireEncryption, boolean requireTrustedServer,
+                   Credentials serverCredentials )
+    {
+        this( id, url, requireEncryption, requireTrustedServer );
+        this.serverCredentials = serverCredentials;
+    }
+
+    public Server( String id, URL url, boolean requireEncryption, boolean requireTrustedServer,
+                   Credentials serverCredentials, URL proxy )
+    {
+        this( id, url, requireEncryption, requireTrustedServer, serverCredentials );
+        this.proxy = proxy;
+    }
+
+    public Server( String id, URL url, boolean requireEncryption, boolean requireTrustedServer,
+                   Credentials serverCredentials, URL proxy, Credentials proxyCredentials
)
+    {
+        this( id, url, requireEncryption, requireTrustedServer, serverCredentials, proxy
);
+        this.proxyCredentials = proxyCredentials;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+
+    public boolean hasUserAgent()
+    {
+        return userAgent != null;
+    }
+
+    public String getUserAgent()
+    {
+        return userAgent;
+    }
+
+    public void setUserAgent( String userAgent )
+    {
+        this.userAgent = userAgent;
+    }
+
+    public void setURL( URL url )
+    {
+        this.url = url;
+    }
+
+    public URL getURL()
+    {
+        return this.url;
+    }
+
+    public Credentials getServerCredentials()
+    {
+        return this.serverCredentials;
+    }
+
+    public void setServerCredentials( Credentials cred )
+    {
+        this.serverCredentials = cred;
+    }
+
+    public URL getProxy()
+    {
+        return this.proxy;
+    }
+
+    public boolean hasProxy()
+    {
+        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;
+    }
+
+    public Set<StreamVerifierFactory> getWriterStreamVerifierFactories()
+    {
+        return writerStreamVerifierFactories;
+    }
+
+    public void setWriterStreamVerifierFactories( Set<StreamVerifierFactory> factories
)
+    {
+        writerStreamVerifierFactories = factories;
+    }
+
+    public boolean hasReaderStreamVerifierFactories()
+    {
+        return readerStreamVerifierFactories != null && readerStreamVerifierFactories.size()
> 0;
+    }
+
+    public Set<StreamVerifierFactory> getReaderStreamVerifierFactories()
+    {
+        return readerStreamVerifierFactories;
+    }
+
+    public void setReaderStreamVerifierFactories( Set<StreamVerifierFactory> factories
)
+    {
+        readerStreamVerifierFactories = factories;
+    }
+
+    public boolean hasWriterStreamObserverFactories()
+    {
+        return writerStreamObserverFactories != null && writerStreamObserverFactories.size()
> 0;
+    }
+
+    public Set<StreamObserverFactory> getWriterStreamObserverFactories()
+    {
+        return writerStreamObserverFactories;
+    }
+
+    public void setWriterStreamObserverFactories( Set<StreamObserverFactory> factories
)
+    {
+        writerStreamObserverFactories = factories;
+    }
+
+    public boolean hasReaderStreamObserverFactories()
+    {
+        return readerStreamObserverFactories != null && readerStreamObserverFactories.size()
> 0;
+    }
+
+    public Set<StreamObserverFactory> getReaderStreamObserverFactories()
+    {
+        return readerStreamObserverFactories;
+    }
+
+    public void setReaderStreamObserverFactories( Set<StreamObserverFactory> factories
)
+    {
+        readerStreamObserverFactories = factories;
+    }
+
+    public boolean isRequireEncryption()
+    {
+        return requireEncryption;
+    }
+
+    public boolean isRequireTrustedServer()
+    {
+        return requireTrustedServer;
+    }
+
+    @Override
+    public String toString()
+    {
+        return id + ": " + url;
+    }
 
 }

Modified: maven/mercury/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/pom.xml?rev=747226&r1=747225&r2=747226&view=diff
==============================================================================
--- maven/mercury/trunk/pom.xml (original)
+++ maven/mercury/trunk/pom.xml Tue Feb 24 00:02:44 2009
@@ -68,13 +68,15 @@
   </modules>
   
   <properties>
+    
+    <classworlds.version>1.3</classworlds.version>
+    
     <plexus.appbooter.version>1.4</plexus.appbooter.version>
-    <plexus.container.version>1.0-beta-3.0.1</plexus.container.version>
+    <plexus.container.version>1.0-beta-3.0.6</plexus.container.version>
     <plexus.component.annotations.version>1.0-beta-3.0.6</plexus.component.annotations.version>
-    <classworlds.version>1.3</classworlds.version>
+    <plexus.component.metadata.version>1.0-beta-3.0.6</plexus.component.metadata.version>
     <plexus.utils.version>1.5.5</plexus.utils.version>
     <plexus.lang.version>1.1</plexus.lang.version>
-    <plexus.component.metadata.version>1.0-beta-3.0.1</plexus.component.metadata.version>
     
     <emma4it.plugin.version>1.0</emma4it.plugin.version>
     



Mime
View raw message