Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reformat and update copyright 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164760 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-04-26 07:39:27 +00:00
parent 3f5d831fc6
commit 3fe271300e
21 changed files with 167 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maven-project/src/main/java/org/apache/maven/project/MavenProject.java
View File

@ -1,7 +1,7 @@
package org.apache.maven.project;
/* ====================================================================
* 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,7 +14,6 @@ package org.apache.maven.project;
* 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;

9
maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
View File

@ -1,7 +1,7 @@
package org.apache.maven.project;
/* ====================================================================
* 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,14 +14,13 @@ package org.apache.maven.project;
* 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.resolver.ArtifactResolver;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolver;
import java.io.File;
import java.util.List;

6
maven-project/src/main/java/org/apache/maven/project/MavenProjectBuildingResult.java
View File

@ -1,7 +1,7 @@
package org.apache.maven.project;
/* ====================================================================
* 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,7 +14,6 @@ package org.apache.maven.project;
* 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.project.validation.ModelValidationResult;
@ -35,7 +34,6 @@ public class MavenProjectBuildingResult
private boolean successful;
/**
*
* @param project
*/
public MavenProjectBuildingResult( MavenProject project )

5
maven-project/src/main/java/org/apache/maven/project/ProjectBuildingException.java
View File

@ -1,7 +1,7 @@
package org.apache.maven.project;
/* ====================================================================
* 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,7 +14,6 @@ package org.apache.maven.project;
* 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.
* ====================================================================
*/
/**

2
maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
View File

@ -16,6 +16,7 @@ package org.apache.maven.project.artifact;
* limitations under the License.
*/
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.factory.DefaultArtifactFactory;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
@ -23,7 +24,6 @@ import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;

5
maven-project/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java
View File

@ -1,7 +1,7 @@
package org.apache.maven.project.inheritance;
/* ====================================================================
* 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,7 +14,6 @@ package org.apache.maven.project.inheritance;
* 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.model.Model;

3
maven-project/src/main/java/org/apache/maven/project/injection/DefaultModelDefaultsInjector.java
View File

@ -121,8 +121,7 @@ public class DefaultModelDefaultsInjector
{
Xpp3Dom goalConfiguration = (Xpp3Dom) localGoal.getConfiguration();
Xpp3Dom defaultGoalConfiguration = (Xpp3Dom) defaultGoal.getConfiguration();
localGoal.setConfiguration(
Xpp3Dom.mergeXpp3Dom( goalConfiguration, defaultGoalConfiguration ) );
localGoal.setConfiguration( Xpp3Dom.mergeXpp3Dom( goalConfiguration, defaultGoalConfiguration ) );
}
}
}

10
maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java
View File

@ -1,7 +1,7 @@
package org.apache.maven.project.interpolation;
/* ====================================================================
* 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,19 +14,19 @@ package org.apache.maven.project.interpolation;
* 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
*
* <p/>
* Created on Feb 2, 2005
*/
public class ModelInterpolationException
extends Exception
{
/** Added: Feb 2, 2005 by jdcasey
/**
* Added: Feb 2, 2005 by jdcasey
*/
public ModelInterpolationException( String expression, Throwable cause )
{

10
maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java
View File

@ -1,7 +1,7 @@
package org.apache.maven.project.interpolation;
/* ====================================================================
* 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,14 +14,13 @@ package org.apache.maven.project.interpolation;
* 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.model.Model;
/**
* @author jdcasey
*
* <p/>
* Created on Feb 2, 2005
*/
public interface ModelInterpolator
@ -29,6 +28,7 @@ public interface ModelInterpolator
String ROLE = ModelInterpolator.class.getName();
Model interpolate( Model project ) throws ModelInterpolationException;
Model interpolate( Model project )
throws ModelInterpolationException;
}

3
maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
View File

@ -106,7 +106,8 @@ public class RegexBasedModelInterpolator
Logger logger = getLogger();
if ( logger != null )
{
logger.debug( "POM interpolation cannot proceed with expression: " + wholeExpr + ". Skipping...", e );
logger.debug( "POM interpolation cannot proceed with expression: " + wholeExpr + ". Skipping...",
e );
}
}

5
maven-project/src/main/java/org/apache/maven/project/path/PathTranslator.java
View File

@ -1,7 +1,7 @@
package org.apache.maven.project.path;
/* ====================================================================
* 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,7 +14,6 @@ package org.apache.maven.project.path;
* 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.model.Model;

5
maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
View File

@ -1,7 +1,7 @@
package org.apache.maven.project.validation;
/* ====================================================================
* 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,7 +14,6 @@ package org.apache.maven.project.validation;
* 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.model.Dependency;

11
maven-project/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java
View File

@ -1,7 +1,7 @@
package org.apache.maven.project.validation;
/* ====================================================================
* 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,7 +14,6 @@ package org.apache.maven.project.validation;
* 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 java.util.ArrayList;
@ -55,14 +54,20 @@ public class ModelValidationResult
public String toString()
{
if ( messages.size() == 0 )
{
return "There was no validation errors.";
}
StringBuffer message = new StringBuffer();
if ( messages.size() == 1 )
{
message.append( "There was 1 validation error: " );
}
else
{
message.append( "There was " + messages.size() + " validation errors: " + NEWLINE );
}
for ( int i = 0; i < messages.size(); i++ )
{

5
maven-project/src/main/java/org/apache/maven/project/validation/ModelValidator.java
View File

@ -1,7 +1,7 @@
package org.apache.maven.project.validation;
/* ====================================================================
* 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,7 +14,6 @@ package org.apache.maven.project.validation;
* 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.model.Model;

16
maven-project/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java
View File

@ -1,5 +1,21 @@
package org.apache.maven.project;
/*
* 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.model.Build;
import org.apache.maven.model.Resource;

2
maven-project/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
View File

@ -1,7 +1,7 @@
package org.apache.maven.project.canonical;
/*
* 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.

2
maven-project/src/test/java/org/apache/maven/project/inheritance/ProjectInheritanceTestCase.java
View File

@ -1,7 +1,7 @@
package org.apache.maven.project.inheritance;
/*
* 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.

3
maven-project/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java
View File

@ -1,7 +1,7 @@
package org.apache.maven.project.inheritance.t00;
/*
* 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.
@ -86,7 +86,6 @@ public class ProjectInheritanceTest
assertEquals( "4.0.0", p4.getModelVersion() );
assertEquals( "4.0.0", p4.getModelVersion() );
}
}

2
maven-project/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java
View File

@ -1,7 +1,7 @@
package org.apache.maven.project.inheritance.t01;
/*
* 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.

3
maven-project/src/test/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolatorTest.java
View File

@ -16,11 +16,10 @@ package org.apache.maven.project.interpolation;
* limitations under the License.
*/
import junit.framework.TestCase;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Model;
import junit.framework.TestCase;
/**
* @author jdcasey
* @version $Id$