brett       2005/03/22 17:16:49

  Modified:    maven-core/src/main/java/org/apache/maven/artifact/factory
                        ArtifactFactory.java DefaultArtifactFactory.java
               maven-core/src/main/java/org/apache/maven/artifact/repository
                        ArtifactRepositoryFactory.java
                        DefaultArtifactRepositoryFactory.java
  Log:
  reformat
  
  Revision  Changes    Path
  1.7       +0 -2      
maven-components/maven-core/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java
  
  Index: ArtifactFactory.java
  ===================================================================
  RCS file: 
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ArtifactFactory.java      22 Mar 2005 07:23:15 -0000      1.6
  +++ ArtifactFactory.java      23 Mar 2005 01:16:49 -0000      1.7
  @@ -23,8 +23,6 @@
   import java.util.List;
   import java.util.Set;
   
  -// TODO: packaging is very confusing - this isn't in artifact after all
  -
   public interface ArtifactFactory
   {
       static String ROLE = ArtifactFactory.class.getName();
  
  
  
  1.12      +0 -2      
maven-components/maven-core/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java
  
  Index: DefaultArtifactFactory.java
  ===================================================================
  RCS file: 
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- DefaultArtifactFactory.java       22 Mar 2005 07:23:15 -0000      1.11
  +++ DefaultArtifactFactory.java       23 Mar 2005 01:16:49 -0000      1.12
  @@ -26,8 +26,6 @@
   import java.util.List;
   import java.util.Set;
   
  -// TODO: packaging is very confusing - this isn't in artifact after all
  -
   public class DefaultArtifactFactory
       extends ArtifactConstructionSupport
       implements ArtifactFactory
  
  
  
  1.4       +12 -13    
maven-components/maven-core/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java
  
  Index: ArtifactRepositoryFactory.java
  ===================================================================
  RCS file: 
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ArtifactRepositoryFactory.java    21 Mar 2005 08:18:33 -0000      1.3
  +++ ArtifactRepositoryFactory.java    23 Mar 2005 01:16:49 -0000      1.4
  @@ -1,20 +1,19 @@
   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.
  - *   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.repository.layout.ArtifactRepositoryLayout;
  @@ -30,6 +29,6 @@
       public static final String ROLE = 
ArtifactRepositoryFactory.class.getName();
   
       public ArtifactRepository createArtifactRepository( Repository 
modelRepository, MavenSettings settings,
  -                                                       
ArtifactRepositoryLayout repositoryLayout );
  +                                                        
ArtifactRepositoryLayout repositoryLayout );
   
   }
  \ No newline at end of file
  
  
  
  1.4       +14 -16    
maven-components/maven-core/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
  
  Index: DefaultArtifactRepositoryFactory.java
  ===================================================================
  RCS file: 
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultArtifactRepositoryFactory.java     21 Mar 2005 08:18:33 -0000      
1.3
  +++ DefaultArtifactRepositoryFactory.java     23 Mar 2005 01:16:49 -0000      
1.4
  @@ -1,20 +1,19 @@
   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.
  - *   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.repository.layout.ArtifactRepositoryLayout;
  @@ -34,7 +33,7 @@
   {
   
       public ArtifactRepository createArtifactRepository( Repository 
modelRepository, MavenSettings settings,
  -                                                       
ArtifactRepositoryLayout repositoryLayout )
  +                                                        
ArtifactRepositoryLayout repositoryLayout )
       {
           Server repoProfile = null;
   
  @@ -49,9 +48,8 @@
               Logger logger = getLogger();
               if ( logger != null )
               {
  -                logger
  -                      .warn( "Cannot associate authentication to repository 
with null id. The offending repository's URL is: "
  -                          + modelRepository.getUrl() );
  +                logger.warn( "Cannot associate authentication to repository 
with null id. The offending repository's URL is: " +
  +                             modelRepository.getUrl() );
               }
           }
   
  
  
  

Reply via email to