maven-m2-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject cvs commit: maven-components/maven-artifact/src/main/java/org/apache/maven/artifact Artifact.java DefaultArtifact.java
Date Wed, 23 Mar 2005 03:40:13 GMT
brett       2005/03/22 19:40:13

  Modified:    maven-artifact/src/main/java/org/apache/maven/artifact/construction
                        ArtifactConstructionSupport.java
               maven-artifact/src/main/java/org/apache/maven/artifact/deployer
                        ArtifactDeployer.java
                        ArtifactDeploymentException.java
                        DefaultArtifactDeployer.java
               maven-artifact/src/main/java/org/apache/maven/artifact/handler/manager
                        ArtifactHandlerNotFoundException.java
                        DefaultArtifactHandlerManager.java
               maven-artifact/src/main/java/org/apache/maven/artifact/handler
                        ArtifactHandler.java EjbHandler.java
                        JarHandler.java JavadocHandler.java
                        PlexusServiceHandler.java PluginHandler.java
                        PomHandler.java SourceHandler.java WarHandler.java
               maven-artifact/src/main/java/org/apache/maven/artifact/installer
                        ArtifactInstallationException.java
                        ArtifactInstaller.java
                        DefaultArtifactInstaller.java
               maven-artifact/src/main/java/org/apache/maven/artifact/manager
                        DefaultWagonManager.java WagonManager.java
               maven-artifact/src/main/java/org/apache/maven/artifact/metadata
                        ArtifactMetadataRetrievalException.java
                        ArtifactMetadataSource.java
               maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout
                        AbstractArtifactRepositoryLayout.java
                        ArtifactPathFormatException.java
                        ArtifactRepositoryLayout.java
                        DefaultRepositoryLayout.java
                        LegacyRepositoryLayout.java
               maven-artifact/src/main/java/org/apache/maven/artifact/repository
                        ArtifactRepository.java
               maven-artifact/src/main/java/org/apache/maven/artifact/resolver/conflict
                        ConflictResolver.java DefaultConflictResolver.java
               maven-artifact/src/main/java/org/apache/maven/artifact/resolver/filter
                        ArtifactFilter.java ExclusionSetFilter.java
               maven-artifact/src/main/java/org/apache/maven/artifact/resolver/transform
                        ArtifactRequestTransformation.java
                        ArtifactRequestTransformationException.java
                        SnapshotRequestTransformation.java
               maven-artifact/src/main/java/org/apache/maven/artifact/resolver
                        ArtifactResolutionException.java
                        ArtifactResolutionResult.java ArtifactResolver.java
                        DefaultArtifactResolver.java
                        TransitiveArtifactResolutionException.java
               maven-artifact/src/main/java/org/apache/maven/artifact
                        Artifact.java DefaultArtifact.java
  Log:
  update licenses and reformat
  
  Revision  Changes    Path
  1.3       +14 -15    maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/construction/ArtifactConstructionSupport.java
  
  Index: ArtifactConstructionSupport.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/construction/ArtifactConstructionSupport.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ArtifactConstructionSupport.java	22 Mar 2005 07:23:16 -0000	1.2
  +++ ArtifactConstructionSupport.java	23 Mar 2005 03:40:12 -0000	1.3
  @@ -1,25 +1,24 @@
   package org.apache.maven.artifact.construction;
   
  -import org.apache.maven.artifact.Artifact;
  -import org.apache.maven.artifact.DefaultArtifact;
  -
  -/* ====================================================================
  - *   Copyright 2001-2004 The Apache Software Foundation.
  +/*
  + * Copyright 2001-2005 The Apache Software Foundation.
    *
  - *   Licensed 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
  + * Licensed 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
  + *      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.
  - * ====================================================================
  + * 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.
    */
   
  +import org.apache.maven.artifact.Artifact;
  +import org.apache.maven.artifact.DefaultArtifact;
  +
   /**
    * @author jdcasey
    */
  
  
  
  1.3       +2 -2      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java
  
  Index: ArtifactDeployer.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ArtifactDeployer.java	1 Mar 2005 06:20:29 -0000	1.2
  +++ ArtifactDeployer.java	23 Mar 2005 03:40:12 -0000	1.3
  @@ -1,7 +1,7 @@
   package org.apache.maven.artifact.deployer;
   
   /*
  - * Copyright 2001-2004 The Apache Software Foundation.
  + * Copyright 2001-2005 The Apache Software Foundation.
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -29,5 +29,5 @@
           throws ArtifactDeploymentException;
   
       void deploy( File source, Artifact artifact, ArtifactRepository deploymentRepository )
  -        throws ArtifactDeploymentException;    
  +        throws ArtifactDeploymentException;
   }
  
  
  
  1.2       +2 -2      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeploymentException.java
  
  Index: ArtifactDeploymentException.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeploymentException.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ArtifactDeploymentException.java	9 Aug 2004 18:37:32 -0000	1.1
  +++ ArtifactDeploymentException.java	23 Mar 2005 03:40:12 -0000	1.2
  @@ -1,7 +1,7 @@
   package org.apache.maven.artifact.deployer;
   
   /*
  - * Copyright 2001-2004 The Apache Software Foundation.
  + * Copyright 2001-2005 The Apache Software Foundation.
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.2       +3 -3      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
  
  Index: DefaultArtifactDeployer.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultArtifactDeployer.java	9 Aug 2004 18:37:32 -0000	1.1
  +++ DefaultArtifactDeployer.java	23 Mar 2005 03:40:12 -0000	1.2
  @@ -1,7 +1,7 @@
   package org.apache.maven.artifact.deployer;
   
   /*
  - * Copyright 2001-2004 The Apache Software Foundation.
  + * Copyright 2001-2005 The Apache Software Foundation.
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -16,11 +16,11 @@
    * limitations under the License.
    */
   
  -import org.apache.maven.artifact.Artifact;
  -import org.apache.maven.artifact.repository.ArtifactRepository;
   import org.apache.maven.artifact.AbstractArtifactComponent;
  +import org.apache.maven.artifact.Artifact;
   import org.apache.maven.artifact.handler.manager.ArtifactHandlerNotFoundException;
   import org.apache.maven.artifact.manager.WagonManager;
  +import org.apache.maven.artifact.repository.ArtifactRepository;
   
   import java.io.File;
   
  
  
  
  1.2       +2 -2      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/manager/ArtifactHandlerNotFoundException.java
  
  Index: ArtifactHandlerNotFoundException.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/manager/ArtifactHandlerNotFoundException.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ArtifactHandlerNotFoundException.java	9 Aug 2004 18:37:33 -0000	1.1
  +++ ArtifactHandlerNotFoundException.java	23 Mar 2005 03:40:12 -0000	1.2
  @@ -1,7 +1,7 @@
   package org.apache.maven.artifact.handler.manager;
   
   /*
  - * Copyright 2001-2004 The Apache Software Foundation.
  + * Copyright 2001-2005 The Apache Software Foundation.
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.8       +3 -2      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java
  
  Index: DefaultArtifactHandlerManager.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DefaultArtifactHandlerManager.java	21 Mar 2005 08:18:34 -0000	1.7
  +++ DefaultArtifactHandlerManager.java	23 Mar 2005 03:40:12 -0000	1.8
  @@ -1,7 +1,7 @@
   package org.apache.maven.artifact.handler.manager;
   
   /*
  - * Copyright 2001-2004 The Apache Software Foundation.
  + * Copyright 2001-2005 The Apache Software Foundation.
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -34,7 +34,8 @@
   
       private ArtifactRepositoryLayout artifactRepositoryLayout;
   
  -    public ArtifactHandler getArtifactHandler( String type ) throws ArtifactHandlerNotFoundException
  +    public ArtifactHandler getArtifactHandler( String type )
  +        throws ArtifactHandlerNotFoundException
       {
           ArtifactHandler handler = (ArtifactHandler) artifactHandlers.get( type );
   
  
  
  
  1.3       +6 -6      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java
  
  Index: ArtifactHandler.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ArtifactHandler.java	1 Mar 2005 04:35:53 -0000	1.2
  +++ ArtifactHandler.java	23 Mar 2005 03:40:12 -0000	1.3
  @@ -1,11 +1,7 @@
   package org.apache.maven.artifact.handler;
   
  -import org.apache.maven.artifact.Artifact;
  -
  -import java.io.File;
  -
   /*
  - * Copyright 2001-2004 The Apache Software Foundation.
  + * Copyright 2001-2005 The Apache Software Foundation.
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -20,6 +16,10 @@
    * limitations under the License.
    */
   
  +import org.apache.maven.artifact.Artifact;
  +
  +import java.io.File;
  +
   /**
    * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
    * @version $Id$
  
  
  
  1.2       +2 -2      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/EjbHandler.java
  
  Index: EjbHandler.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/EjbHandler.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- EjbHandler.java	10 Mar 2005 17:14:39 -0000	1.1
  +++ EjbHandler.java	23 Mar 2005 03:40:12 -0000	1.2
  @@ -1,7 +1,7 @@
   package org.apache.maven.artifact.handler;
   
   /*
  - * Copyright 2001-2004 The Apache Software Foundation.
  + * Copyright 2001-2005 The Apache Software Foundation.
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.3       +2 -2      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/JarHandler.java
  
  Index: JarHandler.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/JarHandler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JarHandler.java	1 Mar 2005 06:20:29 -0000	1.2
  +++ JarHandler.java	23 Mar 2005 03:40:12 -0000	1.3
  @@ -1,7 +1,7 @@
   package org.apache.maven.artifact.handler;
   
   /*
  - * Copyright 2001-2004 The Apache Software Foundation.
  + * Copyright 2001-2005 The Apache Software Foundation.
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.3       +4 -4      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/JavadocHandler.java
  
  Index: JavadocHandler.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/JavadocHandler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JavadocHandler.java	1 Mar 2005 04:35:53 -0000	1.2
  +++ JavadocHandler.java	23 Mar 2005 03:40:12 -0000	1.3
  @@ -1,5 +1,7 @@
  +package org.apache.maven.artifact.handler;
  +
   /*
  - * Copyright 2001-2004 The Apache Software Foundation.
  + * Copyright 2001-2005 The Apache Software Foundation.
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -14,8 +16,6 @@
    * limitations under the License.
    */
   
  -package org.apache.maven.artifact.handler;
  -
   import org.apache.maven.artifact.Artifact;
   
   import java.io.File;
  
  
  
  1.2       +1 -17     maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/PlexusServiceHandler.java
  
  Index: PlexusServiceHandler.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/PlexusServiceHandler.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PlexusServiceHandler.java	15 Mar 2005 07:35:17 -0000	1.1
  +++ PlexusServiceHandler.java	23 Mar 2005 03:40:12 -0000	1.2
  @@ -16,22 +16,6 @@
    * limitations under the License.
    */
   
  -/*
  - * Copyright 2001-2004 The Apache Software Foundation.
  - *
  - * Licensed 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.
  - */
  -
   /**
    * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
    * @version $Id$
  
  
  
  1.5       +2 -2      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/PluginHandler.java
  
  Index: PluginHandler.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/PluginHandler.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- PluginHandler.java	15 Mar 2005 22:31:53 -0000	1.4
  +++ PluginHandler.java	23 Mar 2005 03:40:12 -0000	1.5
  @@ -1,7 +1,7 @@
   package org.apache.maven.artifact.handler;
   
   /*
  - * Copyright 2001-2004 The Apache Software Foundation.
  + * Copyright 2001-2005 The Apache Software Foundation.
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.4       +2 -2      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/PomHandler.java
  
  Index: PomHandler.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/PomHandler.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PomHandler.java	1 Mar 2005 06:20:29 -0000	1.3
  +++ PomHandler.java	23 Mar 2005 03:40:12 -0000	1.4
  @@ -1,7 +1,7 @@
   package org.apache.maven.artifact.handler;
   
   /*
  - * Copyright 2001-2004 The Apache Software Foundation.
  + * Copyright 2001-2005 The Apache Software Foundation.
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.3       +18 -2     maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/SourceHandler.java
  
  Index: SourceHandler.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/SourceHandler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SourceHandler.java	1 Mar 2005 04:35:54 -0000	1.2
  +++ SourceHandler.java	23 Mar 2005 03:40:12 -0000	1.3
  @@ -1,9 +1,25 @@
   package org.apache.maven.artifact.handler;
   
  -import java.io.File;
  +/*
  + * Copyright 2001-2005 The Apache Software Foundation.
  + *
  + * Licensed 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.
  + */
   
   import org.apache.maven.artifact.Artifact;
   
  +import java.io.File;
  +
   /**
    * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
    * @version $Id$
  
  
  
  1.4       +4 -4      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/WarHandler.java
  
  Index: WarHandler.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/WarHandler.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- WarHandler.java	3 Mar 2005 11:43:00 -0000	1.3
  +++ WarHandler.java	23 Mar 2005 03:40:12 -0000	1.4
  @@ -1,5 +1,7 @@
  +package org.apache.maven.artifact.handler;
  +
   /*
  - * Copyright 2001-2004 The Apache Software Foundation.
  + * Copyright 2001-2005 The Apache Software Foundation.
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -14,8 +16,6 @@
    * limitations under the License.
    */
   
  -package org.apache.maven.artifact.handler;
  -
   /**
    * @author <a href="mailto:carlos@apache.org">Carlos Sanchez</a>
    * @version $Id$
  
  
  
  1.2       +2 -2      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/installer/ArtifactInstallationException.java
  
  Index: ArtifactInstallationException.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/installer/ArtifactInstallationException.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ArtifactInstallationException.java	9 Aug 2004 18:37:33 -0000	1.1
  +++ ArtifactInstallationException.java	23 Mar 2005 03:40:12 -0000	1.2
  @@ -1,7 +1,7 @@
   package org.apache.maven.artifact.installer;
   
   /*
  - * Copyright 2001-2004 The Apache Software Foundation.
  + * Copyright 2001-2005 The Apache Software Foundation.
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.3       +21 -3     maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java
  
  Index: ArtifactInstaller.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ArtifactInstaller.java	1 Mar 2005 06:20:29 -0000	1.2
  +++ ArtifactInstaller.java	23 Mar 2005 03:40:12 -0000	1.3
  @@ -1,7 +1,7 @@
   package org.apache.maven.artifact.installer;
   
   /*
  - * Copyright 2001-2004 The Apache Software Foundation.
  + * Copyright 2001-2005 The Apache Software Foundation.
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -29,9 +29,27 @@
   {
       String ROLE = ArtifactInstaller.class.getName();
   
  +    /**
  +     * Install an artifact from a particular directory. The artifact handler is used to determine the filename
  +     * of the source file.
  +     *
  +     * @param basedir         the directory where the artifact is stored
  +     * @param artifact        the artifact definition
  +     * @param localRepository the local repository to install into
  +     * @throws ArtifactInstallationException if an error occurred installing the artifact
  +     */
       void install( String basedir, Artifact artifact, ArtifactRepository localRepository )
           throws ArtifactInstallationException;
   
  +
  +    /**
  +     * Install an artifact from a particular file.
  +     *
  +     * @param source          the file to install
  +     * @param artifact        the artifact definition
  +     * @param localRepository the local repository to install into
  +     * @throws ArtifactInstallationException if an error occurred installing the artifact
  +     */
       void install( File source, Artifact artifact, ArtifactRepository localRepository )
  -        throws ArtifactInstallationException;    
  +        throws ArtifactInstallationException;
   }
  
  
  
  1.5       +1 -4      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
  
  Index: DefaultArtifactInstaller.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultArtifactInstaller.java	21 Mar 2005 08:18:32 -0000	1.4
  +++ DefaultArtifactInstaller.java	23 Mar 2005 03:40:12 -0000	1.5
  @@ -1,7 +1,7 @@
   package org.apache.maven.artifact.installer;
   
   /*
  - * Copyright 2001-2004 The Apache Software Foundation.
  + * Copyright 2001-2005 The Apache Software Foundation.
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -26,9 +26,6 @@
   import java.io.File;
   import java.io.IOException;
   
  -/**
  - * @todo notions of snapshots should be dealt with in one single place.
  - */
   public class DefaultArtifactInstaller
       extends AbstractArtifactComponent
       implements ArtifactInstaller
  
  
  
  1.16      +46 -41    maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
  
  Index: DefaultWagonManager.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- DefaultWagonManager.java	21 Mar 2005 08:18:34 -0000	1.15
  +++ DefaultWagonManager.java	23 Mar 2005 03:40:12 -0000	1.16
  @@ -1,16 +1,19 @@
   package org.apache.maven.artifact.manager;
   
   /*
  - * ====================================================================
  - * Copyright 2001-2004 The Apache Software Foundation. Licensed 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.
  - * ====================================================================
  + * Copyright 2001-2005 The Apache Software Foundation.
  + *
  + * Licensed 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.
    */
   
   import org.apache.maven.artifact.AbstractArtifactComponent;
  @@ -50,7 +53,8 @@
   
       private TransferListener downloadMonitor;
   
  -    public Wagon getWagon( String protocol ) throws UnsupportedProtocolException
  +    public Wagon getWagon( String protocol )
  +        throws UnsupportedProtocolException
       {
           Wagon wagon;
   
  @@ -60,21 +64,23 @@
           }
           catch ( ComponentLookupException e )
           {
  -            throw new UnsupportedProtocolException( "Cannot find wagon which supports the requested protocol: "
  -                + protocol, e );
  +            throw new UnsupportedProtocolException( "Cannot find wagon which supports the requested protocol: " +
  +                                                    protocol, e );
           }
   
           return wagon;
       }
   
       // TODO: don't throw exception
  -    public void releaseWagon( Wagon wagon ) throws Exception
  +    public void releaseWagon( Wagon wagon )
  +        throws Exception
       {
           container.release( wagon );
       }
   
       // TODO: don't throw exception
  -    public void put( File source, Artifact artifact, ArtifactRepository repository ) throws Exception
  +    public void put( File source, Artifact artifact, ArtifactRepository repository )
  +        throws Exception
       {
           Wagon wagon = getWagon( repository.getProtocol() );
   
  @@ -103,18 +109,19 @@
        * @param destination
        * @throws TransferFailedException
        * @todo I want to somehow plug artifact validators at such low level.
  -     *       Simply if artifact was downloaded but it was rejected by
  -     *       validator(s) the loop should continue. Some of the validators can
  -     *       be feeded directly using events so number of i/o operation could be
  -     *       limited. <p/>If we won't plug validation process here the question
  -     *       is what we can do afterwards? We don't know from which
  -     *       ArtifactRepository artifact was fetched and where we should
  -     *       restart. We should be also fetching md5 sums and such from the same
  -     *       exact directory then artifacts <p/>
  +     * Simply if artifact was downloaded but it was rejected by
  +     * validator(s) the loop should continue. Some of the validators can
  +     * be feeded directly using events so number of i/o operation could be
  +     * limited. <p/>If we won't plug validation process here the question
  +     * is what we can do afterwards? We don't know from which
  +     * ArtifactRepository artifact was fetched and where we should
  +     * restart. We should be also fetching md5 sums and such from the same
  +     * exact directory then artifacts <p/>
        * @todo probably all exceptions should just be logged and continue
        * @todo is the exception for warnings logged at debug level correct?
        */
  -    public void get( Artifact artifact, File destination, List repositories ) throws TransferFailedException
  +    public void get( Artifact artifact, File destination, List repositories )
  +        throws TransferFailedException
       {
           File temp = null;
   
  @@ -236,23 +243,18 @@
   
       /**
        * Set the proxy used for a particular protocol.
  -     * 
  +     *
  +     * @param protocol      the protocol (required)
  +     * @param host          the proxy host name (required)
  +     * @param port          the proxy port (required)
  +     * @param username      the username for the proxy, or null if there is none
  +     * @param password      the password for the proxy, or null if there is none
  +     * @param nonProxyHosts the set of hosts not to use the proxy for. Follows Java system
  +     *                      property format: <code>*.foo.com|localhost</code>.
        * @todo [BP] would be nice to configure this via plexus in some way
  -     * @param protocol
  -     *            the protocol (required)
  -     * @param host
  -     *            the proxy host name (required)
  -     * @param port
  -     *            the proxy port (required)
  -     * @param username
  -     *            the username for the proxy, or null if there is none
  -     * @param password
  -     *            the password for the proxy, or null if there is none
  -     * @param nonProxyHosts
  -     *            the set of hosts not to use the proxy for. Follows Java system
  -     *            property format: <code>*.foo.com|localhost</code>.
        */
  -    public void setProxy( String protocol, String host, int port, String username, String password, String nonProxyHosts )
  +    public void setProxy( String protocol, String host, int port, String username, String password,
  +                          String nonProxyHosts )
       {
           ProxyInfo proxyInfo = new ProxyInfo();
           proxyInfo.setHost( host );
  @@ -265,12 +267,15 @@
           proxies.put( protocol, proxyInfo );
       }
   
  -    public void contextualize( Context context ) throws ContextException
  +    public void contextualize( Context context )
  +        throws ContextException
       {
           container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY );
       }
   
  -    /** @todo I'd rather not be setting this explicitly. */
  +    /**
  +     * @todo I'd rather not be setting this explicitly.
  +     */
       public void setDownloadMonitor( TransferListener downloadMonitor )
       {
           this.downloadMonitor = downloadMonitor;
  
  
  
  1.8       +18 -16    maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
  
  Index: WagonManager.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/manager/WagonManager.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- WagonManager.java	9 Mar 2005 05:48:30 -0000	1.7
  +++ WagonManager.java	23 Mar 2005 03:40:12 -0000	1.8
  @@ -1,20 +1,19 @@
   package org.apache.maven.artifact.manager;
   
  -/* ====================================================================
  - *   Copyright 2001-2004 The Apache Software Foundation.
  +/*
  + * Copyright 2001-2005 The Apache Software Foundation.
    *
  - *   Licensed 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
  + * Licensed 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
  + *      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.
  - * ====================================================================
  + * 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.
    */
   
   import org.apache.maven.artifact.Artifact;
  @@ -35,16 +34,19 @@
   {
       String ROLE = WagonManager.class.getName();
   
  -    Wagon getWagon( String protocol ) throws UnsupportedProtocolException;
  +    Wagon getWagon( String protocol )
  +        throws UnsupportedProtocolException;
   
       // TODO: don't throw exception
  -    void releaseWagon( Wagon wagon ) throws Exception;
  +    void releaseWagon( Wagon wagon )
  +        throws Exception;
   
       void get( Artifact artifact, List remoteRepositories, ArtifactRepository localRepository )
           throws TransferFailedException;
   
       // TODO: don't throw exception
  -    void put( File source, Artifact artifact, ArtifactRepository deploymentRepository ) throws Exception;
  +    void put( File source, Artifact artifact, ArtifactRepository deploymentRepository )
  +        throws Exception;
   
       void setProxy( String protocol, String host, int port, String username, String password, String nonProxyHosts );
   
  
  
  
  1.2       +2 -2      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataRetrievalException.java
  
  Index: ArtifactMetadataRetrievalException.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataRetrievalException.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ArtifactMetadataRetrievalException.java	9 Aug 2004 18:37:34 -0000	1.1
  +++ ArtifactMetadataRetrievalException.java	23 Mar 2005 03:40:12 -0000	1.2
  @@ -1,7 +1,7 @@
   package org.apache.maven.artifact.metadata;
   
   /*
  - * Copyright 2001-2004 The Apache Software Foundation.
  + * Copyright 2001-2005 The Apache Software Foundation.
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.6       +1 -6      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataSource.java
  
  Index: ArtifactMetadataSource.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataSource.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ArtifactMetadataSource.java	9 Mar 2005 05:48:31 -0000	1.5
  +++ ArtifactMetadataSource.java	23 Mar 2005 03:40:12 -0000	1.6
  @@ -22,11 +22,6 @@
   import java.util.List;
   import java.util.Set;
   
  -// Currently the only thing we need from the artifact metadata source is the
  -// dependency information, but i figure I'll just leave this generally as a
  -// metadata retrieval mechanism so we can retrieve whatever metadata about
  -// the artifact we may wish to provide in this layer. jvz.
  -
   /**
    * @author <a href="mailto:jason@maven.org">Jason van Zyl </a>
    * @version $Id$
  
  
  
  1.3       +16 -17    maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/AbstractArtifactRepositoryLayout.java
  
  Index: AbstractArtifactRepositoryLayout.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/AbstractArtifactRepositoryLayout.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractArtifactRepositoryLayout.java	22 Mar 2005 07:23:17 -0000	1.2
  +++ AbstractArtifactRepositoryLayout.java	23 Mar 2005 03:40:12 -0000	1.3
  @@ -1,28 +1,27 @@
   package org.apache.maven.artifact.repository.layout;
   
  +/*
  + * Copyright 2001-2005 The Apache Software Foundation.
  + *
  + * Licensed 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.
  + */
  +
   import org.apache.maven.artifact.Artifact;
   import org.apache.maven.artifact.handler.ArtifactHandler;
   import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
   import org.apache.maven.artifact.handler.manager.ArtifactHandlerNotFoundException;
   import org.codehaus.plexus.util.StringUtils;
   
  -/* ====================================================================
  - *   Copyright 2001-2004 The Apache Software Foundation.
  - *
  - *   Licensed 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.
  - * ====================================================================
  - */
  -
   /**
    * @author jdcasey
    */
  
  
  
  1.2       +11 -12    maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactPathFormatException.java
  
  Index: ArtifactPathFormatException.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactPathFormatException.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ArtifactPathFormatException.java	21 Mar 2005 08:18:33 -0000	1.1
  +++ ArtifactPathFormatException.java	23 Mar 2005 03:40:12 -0000	1.2
  @@ -1,20 +1,19 @@
   package org.apache.maven.artifact.repository.layout;
   
  -/* ====================================================================
  - *   Copyright 2001-2004 The Apache Software Foundation.
  +/*
  + * Copyright 2001-2005 The Apache Software Foundation.
    *
  - *   Licensed 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
  + * Licensed 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
  + *      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.
  - * ====================================================================
  + * 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.
    */
   
   /**
  
  
  
  1.2       +13 -13    maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java
  
  Index: ArtifactRepositoryLayout.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ArtifactRepositoryLayout.java	21 Mar 2005 08:18:33 -0000	1.1
  +++ ArtifactRepositoryLayout.java	23 Mar 2005 03:40:12 -0000	1.2
  @@ -1,20 +1,19 @@
   package org.apache.maven.artifact.repository.layout;
   
  -/* ====================================================================
  - *   Copyright 2001-2004 The Apache Software Foundation.
  +/*
  + * Copyright 2001-2005 The Apache Software Foundation.
    *
  - *   Licensed 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
  + * Licensed 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
  + *      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.
  - * ====================================================================
  + * 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.
    */
   
   import org.apache.maven.artifact.Artifact;
  @@ -27,6 +26,7 @@
   
       String ROLE = ArtifactRepositoryLayout.class.getName();
   
  -    String pathOf( Artifact artifact ) throws ArtifactPathFormatException;
  +    String pathOf( Artifact artifact )
  +        throws ArtifactPathFormatException;
   
   }
  \ No newline at end of file
  
  
  
  1.2       +11 -12    maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java
  
  Index: DefaultRepositoryLayout.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultRepositoryLayout.java	21 Mar 2005 08:18:33 -0000	1.1
  +++ DefaultRepositoryLayout.java	23 Mar 2005 03:40:12 -0000	1.2
  @@ -1,20 +1,19 @@
   package org.apache.maven.artifact.repository.layout;
   
  -/* ====================================================================
  - *   Copyright 2001-2004 The Apache Software Foundation.
  +/*
  + * Copyright 2001-2005 The Apache Software Foundation.
    *
  - *   Licensed 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
  + * Licensed 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
  + *      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.
  - * ====================================================================
  + * 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.
    */
   
   /**
  
  
  
  1.2       +11 -12    maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java
  
  Index: LegacyRepositoryLayout.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LegacyRepositoryLayout.java	21 Mar 2005 08:18:33 -0000	1.1
  +++ LegacyRepositoryLayout.java	23 Mar 2005 03:40:12 -0000	1.2
  @@ -1,20 +1,19 @@
   package org.apache.maven.artifact.repository.layout;
   
  -/* ====================================================================
  - *   Copyright 2001-2004 The Apache Software Foundation.
  +/*
  + * Copyright 2001-2005 The Apache Software Foundation.
    *
  - *   Licensed 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
  + * Licensed 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
  + *      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.
  - * ====================================================================
  + * 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.
    */
   
   /**
  
  
  
  1.7       +5 -4      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
  
  Index: ArtifactRepository.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ArtifactRepository.java	21 Mar 2005 08:18:34 -0000	1.6
  +++ ArtifactRepository.java	23 Mar 2005 03:40:13 -0000	1.7
  @@ -1,7 +1,7 @@
   package org.apache.maven.artifact.repository;
   
   /*
  - * Copyright 2001-2004 The Apache Software Foundation.
  + * Copyright 2001-2005 The Apache Software Foundation.
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -25,7 +25,7 @@
   /**
    * This class is an abstraction of the location from/to resources can be
    * transfered.
  - * 
  + *
    * @author <a href="michal.maczka@dimatics.com">Michal Maczka </a>
    * @version $Id$
    */
  @@ -49,7 +49,8 @@
           this.layout = layout;
       }
   
  -    public String pathOf( Artifact artifact ) throws ArtifactPathFormatException
  +    public String pathOf( Artifact artifact )
  +        throws ArtifactPathFormatException
       {
           return layout.pathOf( artifact );
       }
  
  
  
  1.2       +2 -2      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/conflict/ConflictResolver.java
  
  Index: ConflictResolver.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/conflict/ConflictResolver.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ConflictResolver.java	9 Aug 2004 18:37:34 -0000	1.1
  +++ ConflictResolver.java	23 Mar 2005 03:40:13 -0000	1.2
  @@ -1,7 +1,7 @@
   package org.apache.maven.artifact.resolver.conflict;
   
   /*
  - * Copyright 2001-2004 The Apache Software Foundation.
  + * Copyright 2001-2005 The Apache Software Foundation.
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.2       +2 -2      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultConflictResolver.java
  
  Index: DefaultConflictResolver.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultConflictResolver.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultConflictResolver.java	9 Aug 2004 18:37:34 -0000	1.1
  +++ DefaultConflictResolver.java	23 Mar 2005 03:40:13 -0000	1.2
  @@ -1,7 +1,7 @@
   package org.apache.maven.artifact.resolver.conflict;
   
   /*
  - * Copyright 2001-2004 The Apache Software Foundation.
  + * Copyright 2001-2005 The Apache Software Foundation.
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.3       +4 -4      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/filter/ArtifactFilter.java
  
  Index: ArtifactFilter.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/filter/ArtifactFilter.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ArtifactFilter.java	14 Mar 2005 07:24:23 -0000	1.2
  +++ ArtifactFilter.java	23 Mar 2005 03:40:13 -0000	1.3
  @@ -1,9 +1,7 @@
   package org.apache.maven.artifact.resolver.filter;
   
  -import org.apache.maven.artifact.Artifact;
  -
   /*
  - * Copyright 2001-2004 The Apache Software Foundation.
  + * Copyright 2001-2005 The Apache Software Foundation.
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -18,6 +16,8 @@
    * limitations under the License.
    */
   
  +import org.apache.maven.artifact.Artifact;
  +
   /**
    * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
    * @version $Id$
  
  
  
  1.3       +2 -2      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java
  
  Index: ExclusionSetFilter.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ExclusionSetFilter.java	14 Mar 2005 07:24:23 -0000	1.2
  +++ ExclusionSetFilter.java	23 Mar 2005 03:40:13 -0000	1.3
  @@ -1,7 +1,7 @@
   package org.apache.maven.artifact.resolver.filter;
   
   /*
  - * Copyright 2001-2004 The Apache Software Foundation.
  + * Copyright 2001-2005 The Apache Software Foundation.
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.3       +9 -10     maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/transform/ArtifactRequestTransformation.java
  
  Index: ArtifactRequestTransformation.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/transform/ArtifactRequestTransformation.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ArtifactRequestTransformation.java	9 Mar 2005 05:48:30 -0000	1.2
  +++ ArtifactRequestTransformation.java	23 Mar 2005 03:40:13 -0000	1.3
  @@ -1,13 +1,7 @@
   package org.apache.maven.artifact.resolver.transform;
   
  -import org.apache.maven.artifact.Artifact;
  -import org.apache.maven.artifact.repository.ArtifactRepository;
  -
  -import java.util.List;
  -import java.util.Map;
  -
   /*
  - * Copyright 2001-2004 The Apache Software Foundation.
  + * Copyright 2001-2005 The Apache Software Foundation.
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -22,6 +16,12 @@
    * limitations under the License.
    */
   
  +import org.apache.maven.artifact.Artifact;
  +import org.apache.maven.artifact.repository.ArtifactRepository;
  +
  +import java.util.List;
  +import java.util.Map;
  +
   /**
    * @author <a href="mailto:jason@maven.org">Jason van Zyl </a>
    * @version $Id: ArtifactRequestTransformation.java,v 1.1 2005/03/03 15:37:25
  @@ -34,9 +34,8 @@
       /**
        * Take in a artifact and return the transformed artifact. If no
        * transformation has occured the original artifact is returned.
  -     * 
  -     * @param artifact
  -     *            Artifact to be transformed.
  +     *
  +     * @param artifact Artifact to be transformed.
        * @return The transformed Artifact
        */
       Artifact transform( Artifact artifact, ArtifactRepository localRepository, List remoteRepositories, Map parameters )
  
  
  
  1.2       +2 -2      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/transform/ArtifactRequestTransformationException.java
  
  Index: ArtifactRequestTransformationException.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/transform/ArtifactRequestTransformationException.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ArtifactRequestTransformationException.java	3 Mar 2005 15:37:25 -0000	1.1
  +++ ArtifactRequestTransformationException.java	23 Mar 2005 03:40:13 -0000	1.2
  @@ -1,7 +1,7 @@
   package org.apache.maven.artifact.resolver.transform;
   
   /*
  - * Copyright 2001-2004 The Apache Software Foundation.
  + * Copyright 2001-2005 The Apache Software Foundation.
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.3       +20 -2     maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/transform/SnapshotRequestTransformation.java
  
  Index: SnapshotRequestTransformation.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/transform/SnapshotRequestTransformation.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SnapshotRequestTransformation.java	9 Mar 2005 05:48:30 -0000	1.2
  +++ SnapshotRequestTransformation.java	23 Mar 2005 03:40:13 -0000	1.3
  @@ -1,5 +1,21 @@
   package org.apache.maven.artifact.resolver.transform;
   
  +/*
  + * Copyright 2001-2005 The Apache Software Foundation.
  + *
  + * Licensed 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.
  + */
  +
   import org.apache.maven.artifact.Artifact;
   import org.apache.maven.artifact.repository.ArtifactRepository;
   import org.apache.maven.artifact.resolver.ArtifactResolver;
  @@ -23,7 +39,8 @@
   {
       private ArtifactResolver artifactResolver;
   
  -    public Artifact transform( Artifact artifact, ArtifactRepository localRepository, List repositories, Map parameters )
  +    public Artifact transform( Artifact artifact, ArtifactRepository localRepository, List repositories,
  +                               Map parameters )
           throws Exception
       {
           Date localVersion = getLocalVersion( artifact, localRepository );
  @@ -161,7 +178,8 @@
           return retValue;
       }
   
  -    public static Date parseTimestamp( String timestamp ) throws ParseException
  +    public static Date parseTimestamp( String timestamp )
  +        throws ParseException
       {
           Date retValue = getFormatter().parse( timestamp );
   
  
  
  
  1.2       +3 -3      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java
  
  Index: ArtifactResolutionException.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ArtifactResolutionException.java	9 Aug 2004 18:37:33 -0000	1.1
  +++ ArtifactResolutionException.java	23 Mar 2005 03:40:13 -0000	1.2
  @@ -1,7 +1,7 @@
   package org.apache.maven.artifact.resolver;
   
   /*
  - * Copyright 2001-2004 The Apache Software Foundation.
  + * Copyright 2001-2005 The Apache Software Foundation.
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -24,7 +24,7 @@
       extends Exception
   {
   
  -    
  +
       public ArtifactResolutionException( String message )
       {
           super( message );
  
  
  
  1.2       +2 -2      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
  
  Index: ArtifactResolutionResult.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ArtifactResolutionResult.java	9 Aug 2004 18:37:33 -0000	1.1
  +++ ArtifactResolutionResult.java	23 Mar 2005 03:40:13 -0000	1.2
  @@ -1,7 +1,7 @@
   package org.apache.maven.artifact.resolver;
   
   /*
  - * Copyright 2001-2004 The Apache Software Foundation.
  + * Copyright 2001-2005 The Apache Software Foundation.
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.5       +24 -5     maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
  
  Index: ArtifactResolver.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ArtifactResolver.java	9 Mar 2005 05:48:30 -0000	1.4
  +++ ArtifactResolver.java	23 Mar 2005 03:40:13 -0000	1.5
  @@ -1,5 +1,21 @@
   package org.apache.maven.artifact.resolver;
   
  +/*
  + * Copyright 2001-2005 The Apache Software Foundation.
  + *
  + * Licensed 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.
  + */
  +
   import org.apache.maven.artifact.Artifact;
   import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
   import org.apache.maven.artifact.repository.ArtifactRepository;
  @@ -12,7 +28,7 @@
    * I want to use it for hidding the fact that sometime artifact must be
    * downloaded. I am just asking LocalRepository for given artifact and I don't
    * care if it is alredy there or how it will get there.
  - * 
  + *
    * @author <a href="michal.maczka@dimatics.com">Michal Maczka </a>
    * @version $Id$
    */
  @@ -24,16 +40,19 @@
           throws ArtifactResolutionException;
   
       ArtifactResolutionResult resolveTransitively( Artifact artifact, List remoteRepositories,
  -        ArtifactRepository localRepository, ArtifactMetadataSource source ) throws ArtifactResolutionException;
  +                                                  ArtifactRepository localRepository, ArtifactMetadataSource source )
  +        throws ArtifactResolutionException;
   
       Set resolve( Set artifacts, List remoteRepositories, ArtifactRepository localRepository )
           throws ArtifactResolutionException;
   
       ArtifactResolutionResult resolveTransitively( Set artifacts, List remoteRepositories,
  -        ArtifactRepository localRepository, ArtifactMetadataSource source ) throws ArtifactResolutionException;
  +                                                  ArtifactRepository localRepository, ArtifactMetadataSource source )
  +        throws ArtifactResolutionException;
   
       ArtifactResolutionResult resolveTransitively( Set artifacts, List remoteRepositories,
  -        ArtifactRepository localRepository, ArtifactMetadataSource source, ArtifactFilter filter )
  +                                                  ArtifactRepository localRepository, ArtifactMetadataSource source,
  +                                                  ArtifactFilter filter )
           throws ArtifactResolutionException;
   
       void addArtifactRequestTransformation(
  
  
  
  1.22      +16 -0     maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
  
  Index: DefaultArtifactResolver.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- DefaultArtifactResolver.java	22 Mar 2005 07:23:17 -0000	1.21
  +++ DefaultArtifactResolver.java	23 Mar 2005 03:40:13 -0000	1.22
  @@ -1,5 +1,21 @@
   package org.apache.maven.artifact.resolver;
   
  +/*
  + * Copyright 2001-2005 The Apache Software Foundation.
  + *
  + * Licensed 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.
  + */
  +
   import org.apache.maven.artifact.AbstractArtifactComponent;
   import org.apache.maven.artifact.Artifact;
   import org.apache.maven.artifact.construction.ArtifactConstructionSupport;
  
  
  
  1.2       +2 -2      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/TransitiveArtifactResolutionException.java
  
  Index: TransitiveArtifactResolutionException.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/TransitiveArtifactResolutionException.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TransitiveArtifactResolutionException.java	10 Aug 2004 00:29:44 -0000	1.1
  +++ TransitiveArtifactResolutionException.java	23 Mar 2005 03:40:13 -0000	1.2
  @@ -1,7 +1,7 @@
   package org.apache.maven.artifact.resolver;
   
   /*
  - * Copyright 2001-2004 The Apache Software Foundation.
  + * Copyright 2001-2005 The Apache Software Foundation.
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.6       +1 -1      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
  
  Index: Artifact.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Artifact.java	22 Mar 2005 07:23:17 -0000	1.5
  +++ Artifact.java	23 Mar 2005 03:40:13 -0000	1.6
  @@ -1,7 +1,7 @@
   package org.apache.maven.artifact;
   
   /*
  - * Copyright 2001-2004 The Apache Software Foundation.
  + * Copyright 2001-2005 The Apache Software Foundation.
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.16      +2 -2      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
  
  Index: DefaultArtifact.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- DefaultArtifact.java	22 Mar 2005 07:23:17 -0000	1.15
  +++ DefaultArtifact.java	23 Mar 2005 03:40:13 -0000	1.16
  @@ -1,7 +1,7 @@
   package org.apache.maven.artifact;
   
   /*
  - * Copyright 2001-2004 The Apache Software Foundation.
  + * Copyright 2001-2005 The Apache Software Foundation.
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  

Mime
View raw message