From 16036aa792973059e5a20baaffcacf347ce6d822 Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Sat, 25 Dec 2004 16:26:25 +0000 Subject: [PATCH] updating copyright git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163264 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/maven/DefaultMaven.java | 50 ++++---------- .../src/main/java/org/apache/maven/Maven.java | 32 ++++----- .../java/org/apache/maven/MavenConstants.java | 23 +++---- .../JarOverrideRequestTransformation.java | 24 +++---- .../maven/artifact/MavenMetadataSource.java | 41 ++++++------ .../SnapshotRequestTransformation.java | 24 +++---- .../artifact/factory/ArtifactFactory.java | 23 +++---- .../factory/DefaultArtifactFactory.java | 23 +++---- .../java/org/apache/maven/cli/MavenCli.java | 24 +++---- .../exception/MavenExceptionHandler.java | 23 +++---- .../MavenHomeNotDefinedException.java | 23 +++---- .../AbstractMavenExecutionRequest.java | 37 ++++++++++- .../AbstractMavenExecutionRequestHandler.java | 60 ++++++++++++++++- .../execution/MavenExecutionRequest.java | 25 ++++++- .../MavenExecutionRequestHandler.java | 17 +++++ .../execution/MavenExecutionResponse.java | 23 +++---- .../execution/MavenSetupExecutionRequest.java | 18 ++++- .../MavenInitializingExecutionRequest.java | 18 ++++- ...enInitializingExecutionRequestHandler.java | 37 ++++++----- ...ltMavenExecutionRequestHandlerManager.java | 19 +++++- .../MavenExecutionRequestHandlerManager.java | 17 +++++ ...cutionRequestHandlerNotFoundException.java | 17 +++++ .../project/MavenProjectExecutionRequest.java | 17 +++++ .../MavenProjectExecutionRequestHandler.java | 66 +++++++++---------- .../reactor/MavenReactorExecutionRequest.java | 17 +++++ .../MavenReactorExecutionRequestHandler.java | 17 +++++ .../goal/AbstractMavenGoalPhase.java | 23 +++---- .../goal/DefaultMavenGoalPhaseManager.java | 23 +++---- .../goal/GoalExecutionException.java | 23 +++---- .../lifecycle/goal/GoalNotFoundException.java | 26 ++++---- .../goal/MavenGoalExecutionContext.java | 17 +++++ .../maven/lifecycle/goal/MavenGoalPhase.java | 23 +++---- .../lifecycle/goal/MavenGoalPhaseManager.java | 23 +++---- .../goal/phase/DependencyDownloadPhase.java | 23 +++---- .../goal/phase/DependencyResolutionPhase.java | 23 +++---- .../goal/phase/GoalAttainmentPhase.java | 27 ++++---- .../goal/phase/GoalMappingPhase.java | 30 ++++----- .../goal/phase/GoalResolutionPhase.java | 33 +++++----- .../goal/phase/PluginResolutionPhase.java | 29 ++++---- .../session/AbstractMavenSessionPhase.java | 27 ++++---- .../DefaultMavenSessionPhaseManager.java | 33 +++++----- .../maven/lifecycle/session/MavenSession.java | 62 ++++++++++------- .../lifecycle/session/MavenSessionPhase.java | 26 ++++---- .../session/MavenSessionPhaseManager.java | 27 ++++---- .../session/phase/GoalExecutionPhase.java | 33 +++++----- .../maven/plugin/DefaultPluginManager.java | 26 +++++--- .../maven/plugin/MavenMojoDescriptor.java | 23 +++---- .../maven/plugin/MavenPluginDependency.java | 17 +++++ .../maven/plugin/MavenPluginDescriptor.java | 23 +++---- .../maven/plugin/MavenPluginDiscoverer.java | 23 +++---- .../plugin/PluginConfigurationException.java | 23 +++---- .../apache/maven/plugin/PluginManager.java | 23 +++---- .../PluginParameterExpressionEvaluator.java | 23 +++---- .../ReflectionProjectValueExtractor.java | 25 +++++-- .../project/DefaultMavenProjectBuilder.java | 23 +++---- .../apache/maven/project/MavenProject.java | 23 +++---- .../maven/project/MavenProjectBuilder.java | 23 +++---- .../project/MavenProjectBuildingResult.java | 23 +++---- .../project/ProjectBuildingException.java | 23 +++---- .../DefaultModelInheritanceAssembler.java | 30 ++++----- .../ModelInheritanceAssembler.java | 23 +++---- .../project/path/DefaultPathTranslator.java | 23 +++---- .../maven/project/path/PathTranslator.java | 33 +++++----- .../validation/DefaultModelValidator.java | 23 +++---- .../validation/ModelValidationResult.java | 23 +++---- .../project/validation/ModelValidator.java | 23 +++---- .../maven/reactor/ReactorException.java | 23 +++---- .../maven/repository/RepositoryUtils.java | 17 +++++ .../maven/util/AbstractGoalVisitor.java | 23 +++---- .../org/apache/maven/util/GoalVisitor.java | 23 +++---- .../org/apache/maven/util/GoalWalker.java | 29 ++++---- .../maven/util/GraphTraversalException.java | 23 +++---- .../maven/util/introspection/ClassMap.java | 23 +++---- .../maven/util/introspection/MethodMap.java | 38 +++++------ .../java/org/apache/maven/MavenTestCase.java | 9 ++- 75 files changed, 1152 insertions(+), 801 deletions(-) diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java index 87d34e2f9a..f70eba493f 100644 --- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java +++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java @@ -1,53 +1,29 @@ package org.apache.maven; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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 java.io.File; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import org.apache.maven.lifecycle.goal.GoalNotFoundException; -import org.apache.maven.lifecycle.session.MavenSession; -import org.apache.maven.lifecycle.session.MavenSessionPhaseManager; -import org.apache.maven.plugin.PluginManager; -import org.apache.maven.plugin.descriptor.MojoDescriptor; -import org.apache.maven.project.MavenProject; -import org.apache.maven.project.MavenProjectBuilder; -import org.apache.maven.project.ProjectBuildingException; -import org.apache.maven.reactor.ReactorException; import org.apache.maven.execution.MavenExecutionRequest; import org.apache.maven.execution.MavenExecutionRequestHandler; -import org.apache.maven.execution.manager.MavenExecutionRequestHandlerManager; import org.apache.maven.execution.MavenExecutionResponse; import org.apache.maven.execution.manager.MavenExecutionRequestHandlerManager; - -import org.codehaus.plexus.ArtifactEnabledContainer; -import org.codehaus.plexus.PlexusConstants; -import org.codehaus.plexus.context.Context; -import org.codehaus.plexus.context.ContextException; +import org.apache.maven.lifecycle.goal.GoalNotFoundException; import org.codehaus.plexus.i18n.I18N; import org.codehaus.plexus.logging.AbstractLogEnabled; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable; -import org.codehaus.plexus.util.FileUtils; -import org.codehaus.plexus.util.StringUtils; /** * @author Jason van Zyl diff --git a/maven-core/src/main/java/org/apache/maven/Maven.java b/maven-core/src/main/java/org/apache/maven/Maven.java index 1cb193e2a5..a05ea92038 100644 --- a/maven-core/src/main/java/org/apache/maven/Maven.java +++ b/maven-core/src/main/java/org/apache/maven/Maven.java @@ -1,31 +1,25 @@ package org.apache.maven; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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.lifecycle.goal.GoalNotFoundException; -import org.apache.maven.plugin.descriptor.MojoDescriptor; -import org.apache.maven.project.MavenProject; -import org.apache.maven.project.ProjectBuildingException; -import org.apache.maven.reactor.ReactorException; import org.apache.maven.execution.MavenExecutionRequest; import org.apache.maven.execution.MavenExecutionResponse; - -import java.io.File; -import java.util.Map; +import org.apache.maven.lifecycle.goal.GoalNotFoundException; /** * @author Jason van Zyl diff --git a/maven-core/src/main/java/org/apache/maven/MavenConstants.java b/maven-core/src/main/java/org/apache/maven/MavenConstants.java index 91f6a64e84..f2e46157c5 100644 --- a/maven-core/src/main/java/org/apache/maven/MavenConstants.java +++ b/maven-core/src/main/java/org/apache/maven/MavenConstants.java @@ -1,19 +1,20 @@ package org.apache.maven; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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. + * ==================================================================== */ public class MavenConstants diff --git a/maven-core/src/main/java/org/apache/maven/artifact/JarOverrideRequestTransformation.java b/maven-core/src/main/java/org/apache/maven/artifact/JarOverrideRequestTransformation.java index feb616c914..742b167ef3 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/JarOverrideRequestTransformation.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/JarOverrideRequestTransformation.java @@ -1,22 +1,22 @@ package org.apache.maven.artifact; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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.repository.ArtifactRepository; import org.apache.maven.artifact.request.ArtifactRequestTransformation; diff --git a/maven-core/src/main/java/org/apache/maven/artifact/MavenMetadataSource.java b/maven-core/src/main/java/org/apache/maven/artifact/MavenMetadataSource.java index 48534550cf..7708540f77 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/MavenMetadataSource.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/MavenMetadataSource.java @@ -1,10 +1,21 @@ package org.apache.maven.artifact; -import java.io.FileReader; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; +/* ==================================================================== + * 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. + * ==================================================================== + */ import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException; import org.apache.maven.artifact.metadata.ArtifactMetadataSource; @@ -16,21 +27,11 @@ import org.apache.maven.model.Model; import org.apache.maven.model.Parent; import org.apache.maven.model.io.xpp3.MavenXpp3Reader; -/* - * 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. - */ +import java.io.FileReader; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; /** * @author Jason van Zyl diff --git a/maven-core/src/main/java/org/apache/maven/artifact/SnapshotRequestTransformation.java b/maven-core/src/main/java/org/apache/maven/artifact/SnapshotRequestTransformation.java index 8b51205199..0b3a825368 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/SnapshotRequestTransformation.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/SnapshotRequestTransformation.java @@ -1,22 +1,22 @@ package org.apache.maven.artifact; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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.repository.ArtifactRepository; import org.apache.maven.artifact.request.ArtifactRequestTransformation; import org.apache.maven.artifact.resolver.ArtifactResolver; diff --git a/maven-core/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java b/maven-core/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java index f4cf063ff1..c6b3cfd4f3 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java @@ -1,19 +1,20 @@ package org.apache.maven.artifact.factory; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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; diff --git a/maven-core/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java b/maven-core/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java index 22eee259b3..76748d69f1 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java @@ -1,19 +1,20 @@ package org.apache.maven.artifact.factory; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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; diff --git a/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java index 4c0eb1affb..bc64703763 100644 --- a/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java +++ b/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java @@ -1,19 +1,20 @@ package org.apache.maven.cli; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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.commons.cli.CommandLine; @@ -38,7 +39,6 @@ import org.codehaus.plexus.embed.ArtifactEnabledEmbedder; import java.io.File; import java.io.FileInputStream; import java.util.Properties; -import java.util.Date; /** * @author Jason van Zyl diff --git a/maven-core/src/main/java/org/apache/maven/exception/MavenExceptionHandler.java b/maven-core/src/main/java/org/apache/maven/exception/MavenExceptionHandler.java index 834de2d46d..7aab1f93ea 100644 --- a/maven-core/src/main/java/org/apache/maven/exception/MavenExceptionHandler.java +++ b/maven-core/src/main/java/org/apache/maven/exception/MavenExceptionHandler.java @@ -1,19 +1,20 @@ package org.apache.maven.exception; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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. + * ==================================================================== */ /** diff --git a/maven-core/src/main/java/org/apache/maven/exception/MavenHomeNotDefinedException.java b/maven-core/src/main/java/org/apache/maven/exception/MavenHomeNotDefinedException.java index a19609fdf1..db4ddaab17 100644 --- a/maven-core/src/main/java/org/apache/maven/exception/MavenHomeNotDefinedException.java +++ b/maven-core/src/main/java/org/apache/maven/exception/MavenHomeNotDefinedException.java @@ -1,19 +1,20 @@ package org.apache.maven.exception; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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. + * ==================================================================== */ /** diff --git a/maven-core/src/main/java/org/apache/maven/execution/AbstractMavenExecutionRequest.java b/maven-core/src/main/java/org/apache/maven/execution/AbstractMavenExecutionRequest.java index 4e2a855eef..284e868a22 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/AbstractMavenExecutionRequest.java +++ b/maven-core/src/main/java/org/apache/maven/execution/AbstractMavenExecutionRequest.java @@ -1,8 +1,25 @@ package org.apache.maven.execution; -import org.apache.maven.artifact.repository.ArtifactRepository; +/* ==================================================================== + * 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. + * ==================================================================== + */ + +import org.apache.maven.artifact.repository.ArtifactRepository; +import org.apache.maven.lifecycle.session.MavenSession; -import java.io.File; import java.util.List; /** @@ -18,6 +35,8 @@ public class AbstractMavenExecutionRequest protected String type; + protected MavenSession session; + public AbstractMavenExecutionRequest( ArtifactRepository localRepository, List goals ) { this.localRepository = localRepository; @@ -39,4 +58,18 @@ public class AbstractMavenExecutionRequest { return type; } + + // ---------------------------------------------------------------------- + // Putting the session here but it can probably be folded right in here. + // ---------------------------------------------------------------------- + + public MavenSession getSession() + { + return session; + } + + public void setSession( MavenSession session ) + { + this.session = session; + } } diff --git a/maven-core/src/main/java/org/apache/maven/execution/AbstractMavenExecutionRequestHandler.java b/maven-core/src/main/java/org/apache/maven/execution/AbstractMavenExecutionRequestHandler.java index 625f21bb06..4c9ee11624 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/AbstractMavenExecutionRequestHandler.java +++ b/maven-core/src/main/java/org/apache/maven/execution/AbstractMavenExecutionRequestHandler.java @@ -1,9 +1,25 @@ package org.apache.maven.execution; +/* ==================================================================== + * 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. + * ==================================================================== + */ + import org.apache.maven.lifecycle.session.MavenSession; import org.apache.maven.lifecycle.session.MavenSessionPhaseManager; import org.apache.maven.plugin.PluginManager; -import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProjectBuilder; import org.codehaus.plexus.PlexusConstants; import org.codehaus.plexus.PlexusContainer; @@ -45,11 +61,11 @@ public abstract class AbstractMavenExecutionRequestHandler // the session type would be specific to the request i.e. having a project // or not. - protected MavenSession createSession( MavenExecutionRequest request, MavenProject project ) + protected MavenSession createSession( MavenExecutionRequest request ) + throws Exception { MavenSession session = new MavenSession( container, pluginManager, - project, request.getLocalRepository(), request.getGoals() ); @@ -159,4 +175,42 @@ public abstract class AbstractMavenExecutionRequestHandler return secs + " seconds"; } } + + // ---------------------------------------------------------------------- + // + // ---------------------------------------------------------------------- + + public void handle( MavenExecutionRequest request, MavenExecutionResponse response ) + throws Exception + { + try + { + request.setSession( createSession( request ) ); + + response.setStart( new Date() ); + + sessionPhaseManager.execute( request, response ); + + response.setFinish( new Date() ); + } + catch ( Exception e ) + { + response.setFinish( new Date() ); + + response.setException( e ); + + logError( response ); + + return; + } + + if ( response.isExecutionFailure() ) + { + logFailure( response ); + } + else + { + logSuccess( response ); + } + } } diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java index ebbf1e0fec..caf27efcbe 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java +++ b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java @@ -1,8 +1,25 @@ package org.apache.maven.execution; -import org.apache.maven.artifact.repository.ArtifactRepository; +/* ==================================================================== + * 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. + * ==================================================================== + */ + +import org.apache.maven.artifact.repository.ArtifactRepository; +import org.apache.maven.lifecycle.session.MavenSession; -import java.io.File; import java.util.List; /** @@ -16,4 +33,8 @@ public interface MavenExecutionRequest List getGoals(); String getType(); + + void setSession( MavenSession session ); + + MavenSession getSession(); } diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequestHandler.java b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequestHandler.java index e63af40c85..5b61b5bbcd 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequestHandler.java +++ b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequestHandler.java @@ -1,5 +1,22 @@ package org.apache.maven.execution; +/* ==================================================================== + * 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 Jason van Zyl diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResponse.java b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResponse.java index 607c04af97..eea9228686 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResponse.java +++ b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResponse.java @@ -1,19 +1,20 @@ package org.apache.maven.execution; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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.plugin.FailureResponse; diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenSetupExecutionRequest.java b/maven-core/src/main/java/org/apache/maven/execution/MavenSetupExecutionRequest.java index 1dd082a637..222384d615 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/MavenSetupExecutionRequest.java +++ b/maven-core/src/main/java/org/apache/maven/execution/MavenSetupExecutionRequest.java @@ -1,8 +1,24 @@ package org.apache.maven.execution; +/* ==================================================================== + * 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. + * ==================================================================== + */ + import org.apache.maven.artifact.repository.ArtifactRepository; -import java.io.File; import java.util.List; /** diff --git a/maven-core/src/main/java/org/apache/maven/execution/initialize/MavenInitializingExecutionRequest.java b/maven-core/src/main/java/org/apache/maven/execution/initialize/MavenInitializingExecutionRequest.java index c84206120f..fd9395e63b 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/initialize/MavenInitializingExecutionRequest.java +++ b/maven-core/src/main/java/org/apache/maven/execution/initialize/MavenInitializingExecutionRequest.java @@ -1,9 +1,25 @@ package org.apache.maven.execution.initialize; +/* ==================================================================== + * 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. + * ==================================================================== + */ + import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.execution.AbstractMavenExecutionRequest; -import java.io.File; import java.util.List; /** diff --git a/maven-core/src/main/java/org/apache/maven/execution/initialize/MavenInitializingExecutionRequestHandler.java b/maven-core/src/main/java/org/apache/maven/execution/initialize/MavenInitializingExecutionRequestHandler.java index c0fdcb30ec..705c4f785c 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/initialize/MavenInitializingExecutionRequestHandler.java +++ b/maven-core/src/main/java/org/apache/maven/execution/initialize/MavenInitializingExecutionRequestHandler.java @@ -1,18 +1,26 @@ package org.apache.maven.execution.initialize; -import org.apache.maven.project.MavenProject; -import org.apache.maven.reactor.ReactorException; -import org.apache.maven.execution.reactor.MavenReactorExecutionRequest; -import org.apache.maven.execution.project.MavenProjectExecutionRequestHandler; -import org.apache.maven.execution.MavenExecutionRequestHandler; -import org.apache.maven.execution.MavenExecutionRequest; -import org.apache.maven.execution.MavenExecutionResponse; -import org.codehaus.plexus.util.FileUtils; +/* ==================================================================== + * 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. + * ==================================================================== + */ -import java.io.File; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; +import org.apache.maven.execution.MavenExecutionRequest; +import org.apache.maven.execution.MavenExecutionRequestHandler; +import org.apache.maven.execution.MavenExecutionResponse; +import org.apache.maven.execution.project.MavenProjectExecutionRequestHandler; /** * @author Jason van Zyl @@ -22,9 +30,4 @@ public class MavenInitializingExecutionRequestHandler extends MavenProjectExecutionRequestHandler implements MavenExecutionRequestHandler { - public void handle( MavenExecutionRequest request, MavenExecutionResponse response ) - throws Exception - { - super.handle( null, null ); - } } diff --git a/maven-core/src/main/java/org/apache/maven/execution/manager/DefaultMavenExecutionRequestHandlerManager.java b/maven-core/src/main/java/org/apache/maven/execution/manager/DefaultMavenExecutionRequestHandlerManager.java index 4972d4507c..84210d993e 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/manager/DefaultMavenExecutionRequestHandlerManager.java +++ b/maven-core/src/main/java/org/apache/maven/execution/manager/DefaultMavenExecutionRequestHandlerManager.java @@ -1,7 +1,24 @@ package org.apache.maven.execution.manager; -import org.codehaus.plexus.logging.AbstractLogEnabled; +/* ==================================================================== + * 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. + * ==================================================================== + */ + import org.apache.maven.execution.MavenExecutionRequestHandler; +import org.codehaus.plexus.logging.AbstractLogEnabled; import java.util.Map; diff --git a/maven-core/src/main/java/org/apache/maven/execution/manager/MavenExecutionRequestHandlerManager.java b/maven-core/src/main/java/org/apache/maven/execution/manager/MavenExecutionRequestHandlerManager.java index ca12d9c4eb..524a76bc5c 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/manager/MavenExecutionRequestHandlerManager.java +++ b/maven-core/src/main/java/org/apache/maven/execution/manager/MavenExecutionRequestHandlerManager.java @@ -1,6 +1,23 @@ package org.apache.maven.execution.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. + * ==================================================================== + */ + import org.apache.maven.execution.MavenExecutionRequestHandler; /** diff --git a/maven-core/src/main/java/org/apache/maven/execution/manager/MavenExecutionRequestHandlerNotFoundException.java b/maven-core/src/main/java/org/apache/maven/execution/manager/MavenExecutionRequestHandlerNotFoundException.java index f6098b5166..5323ecdb58 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/manager/MavenExecutionRequestHandlerNotFoundException.java +++ b/maven-core/src/main/java/org/apache/maven/execution/manager/MavenExecutionRequestHandlerNotFoundException.java @@ -1,5 +1,22 @@ package org.apache.maven.execution.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. + * ==================================================================== + */ + /** * @author Jason van Zyl * @version $Id$ diff --git a/maven-core/src/main/java/org/apache/maven/execution/project/MavenProjectExecutionRequest.java b/maven-core/src/main/java/org/apache/maven/execution/project/MavenProjectExecutionRequest.java index b3ec2bc8a8..1b5861b223 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/project/MavenProjectExecutionRequest.java +++ b/maven-core/src/main/java/org/apache/maven/execution/project/MavenProjectExecutionRequest.java @@ -1,5 +1,22 @@ package org.apache.maven.execution.project; +/* ==================================================================== + * 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. + * ==================================================================== + */ + import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.execution.AbstractMavenExecutionRequest; diff --git a/maven-core/src/main/java/org/apache/maven/execution/project/MavenProjectExecutionRequestHandler.java b/maven-core/src/main/java/org/apache/maven/execution/project/MavenProjectExecutionRequestHandler.java index 7719fab472..e53662c9b8 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/project/MavenProjectExecutionRequestHandler.java +++ b/maven-core/src/main/java/org/apache/maven/execution/project/MavenProjectExecutionRequestHandler.java @@ -1,11 +1,29 @@ package org.apache.maven.execution.project; +/* ==================================================================== + * 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. + * ==================================================================== + */ + import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.execution.AbstractMavenExecutionRequestHandler; import org.apache.maven.execution.MavenExecutionRequest; import org.apache.maven.execution.MavenExecutionResponse; import org.apache.maven.project.MavenProject; import org.apache.maven.project.ProjectBuildingException; +import org.apache.maven.lifecycle.session.MavenSession; import java.io.File; import java.util.Date; @@ -17,42 +35,6 @@ import java.util.Date; public class MavenProjectExecutionRequestHandler extends AbstractMavenExecutionRequestHandler { - public void handle( MavenExecutionRequest request, MavenExecutionResponse response ) - throws Exception - { - try - { - MavenProject project = getProject( ( (MavenProjectExecutionRequest) request ).getPom(), request.getLocalRepository() ); - - Date s = new Date(); - - response = sessionPhaseManager.execute( createSession( request, project ) ); - - response.setStart( s ); - - response.setFinish( new Date() ); - } - catch ( Exception e ) - { - response.setFinish( new Date() ); - - response.setException( e ); - - logError( response ); - - return; - } - - if ( response.isExecutionFailure() ) - { - logFailure( response ); - } - else - { - logSuccess( response ); - } - } - // ---------------------------------------------------------------------- // Project building // ---------------------------------------------------------------------- @@ -70,4 +52,16 @@ public class MavenProjectExecutionRequestHandler return projectBuilder.build( pom, localRepository ); } + + protected MavenSession createSession( MavenExecutionRequest request ) + throws Exception + { + MavenSession session = super.createSession( request ); + + MavenProject project = getProject( ( (MavenProjectExecutionRequest) request ).getPom(), request.getLocalRepository() ); + + session.setProject( project ); + + return session; + } } diff --git a/maven-core/src/main/java/org/apache/maven/execution/reactor/MavenReactorExecutionRequest.java b/maven-core/src/main/java/org/apache/maven/execution/reactor/MavenReactorExecutionRequest.java index 9155bee152..c9ba6d0d58 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/reactor/MavenReactorExecutionRequest.java +++ b/maven-core/src/main/java/org/apache/maven/execution/reactor/MavenReactorExecutionRequest.java @@ -1,5 +1,22 @@ package org.apache.maven.execution.reactor; +/* ==================================================================== + * 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. + * ==================================================================== + */ + import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.execution.AbstractMavenExecutionRequest; diff --git a/maven-core/src/main/java/org/apache/maven/execution/reactor/MavenReactorExecutionRequestHandler.java b/maven-core/src/main/java/org/apache/maven/execution/reactor/MavenReactorExecutionRequestHandler.java index d5134fbab5..77a5f00786 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/reactor/MavenReactorExecutionRequestHandler.java +++ b/maven-core/src/main/java/org/apache/maven/execution/reactor/MavenReactorExecutionRequestHandler.java @@ -1,5 +1,22 @@ package org.apache.maven.execution.reactor; +/* ==================================================================== + * 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. + * ==================================================================== + */ + import org.apache.maven.execution.MavenExecutionRequest; import org.apache.maven.execution.MavenExecutionResponse; import org.apache.maven.execution.project.MavenProjectExecutionRequest; diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/goal/AbstractMavenGoalPhase.java b/maven-core/src/main/java/org/apache/maven/lifecycle/goal/AbstractMavenGoalPhase.java index 9eb6889585..43d8f89514 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/goal/AbstractMavenGoalPhase.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/goal/AbstractMavenGoalPhase.java @@ -1,19 +1,20 @@ package org.apache.maven.lifecycle.goal; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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.codehaus.plexus.logging.AbstractLogEnabled; diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/goal/DefaultMavenGoalPhaseManager.java b/maven-core/src/main/java/org/apache/maven/lifecycle/goal/DefaultMavenGoalPhaseManager.java index a6171e7329..bb27bbc4e2 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/goal/DefaultMavenGoalPhaseManager.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/goal/DefaultMavenGoalPhaseManager.java @@ -1,19 +1,20 @@ package org.apache.maven.lifecycle.goal; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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.codehaus.plexus.logging.AbstractLogEnabled; diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/goal/GoalExecutionException.java b/maven-core/src/main/java/org/apache/maven/lifecycle/goal/GoalExecutionException.java index 26a1302607..56ac764366 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/goal/GoalExecutionException.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/goal/GoalExecutionException.java @@ -1,19 +1,20 @@ package org.apache.maven.lifecycle.goal; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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. + * ==================================================================== */ /** diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/goal/GoalNotFoundException.java b/maven-core/src/main/java/org/apache/maven/lifecycle/goal/GoalNotFoundException.java index 0855787adb..732e5992a6 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/goal/GoalNotFoundException.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/goal/GoalNotFoundException.java @@ -1,23 +1,23 @@ package org.apache.maven.lifecycle.goal; - - -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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. + * ==================================================================== */ + public class GoalNotFoundException extends GoalExecutionException { diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/goal/MavenGoalExecutionContext.java b/maven-core/src/main/java/org/apache/maven/lifecycle/goal/MavenGoalExecutionContext.java index 8b42ccd718..6f9f9fb9a9 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/goal/MavenGoalExecutionContext.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/goal/MavenGoalExecutionContext.java @@ -1,5 +1,22 @@ package org.apache.maven.lifecycle.goal; +/* ==================================================================== + * 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. + * ==================================================================== + */ + import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.lifecycle.session.MavenSession; import org.apache.maven.plugin.FailureResponse; diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/goal/MavenGoalPhase.java b/maven-core/src/main/java/org/apache/maven/lifecycle/goal/MavenGoalPhase.java index d0280701a5..2e5482bed1 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/goal/MavenGoalPhase.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/goal/MavenGoalPhase.java @@ -1,19 +1,20 @@ package org.apache.maven.lifecycle.goal; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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.codehaus.plexus.logging.Logger; diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/goal/MavenGoalPhaseManager.java b/maven-core/src/main/java/org/apache/maven/lifecycle/goal/MavenGoalPhaseManager.java index fb276bb462..3a71e91840 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/goal/MavenGoalPhaseManager.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/goal/MavenGoalPhaseManager.java @@ -1,19 +1,20 @@ package org.apache.maven.lifecycle.goal; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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 java.util.List; diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/DependencyDownloadPhase.java b/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/DependencyDownloadPhase.java index 0878ae9485..16dddcb2a6 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/DependencyDownloadPhase.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/DependencyDownloadPhase.java @@ -1,19 +1,20 @@ package org.apache.maven.lifecycle.goal.phase; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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; diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/DependencyResolutionPhase.java b/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/DependencyResolutionPhase.java index 396315838b..3af1ec8a2e 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/DependencyResolutionPhase.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/DependencyResolutionPhase.java @@ -1,19 +1,20 @@ package org.apache.maven.lifecycle.goal.phase; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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.MavenMetadataSource; diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/GoalAttainmentPhase.java b/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/GoalAttainmentPhase.java index 6e70e9a738..3844944b21 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/GoalAttainmentPhase.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/GoalAttainmentPhase.java @@ -1,29 +1,30 @@ package org.apache.maven.lifecycle.goal.phase; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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.lifecycle.goal.AbstractMavenGoalPhase; import org.apache.maven.lifecycle.goal.GoalExecutionException; import org.apache.maven.lifecycle.goal.MavenGoalExecutionContext; -import org.apache.maven.plugin.PluginParameterExpressionEvaluator; import org.apache.maven.plugin.Plugin; +import org.apache.maven.plugin.PluginConfigurationException; import org.apache.maven.plugin.PluginExecutionRequest; import org.apache.maven.plugin.PluginExecutionResponse; -import org.apache.maven.plugin.PluginConfigurationException; +import org.apache.maven.plugin.PluginParameterExpressionEvaluator; import org.apache.maven.plugin.descriptor.MojoDescriptor; import org.apache.maven.plugin.descriptor.Parameter; import org.apache.maven.project.MavenProject; diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/GoalMappingPhase.java b/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/GoalMappingPhase.java index 67b04ce347..a5b0cb604e 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/GoalMappingPhase.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/GoalMappingPhase.java @@ -1,24 +1,22 @@ package org.apache.maven.lifecycle.goal.phase; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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 java.util.HashSet; -import java.util.Set; - import org.apache.maven.lifecycle.goal.AbstractMavenGoalPhase; import org.apache.maven.lifecycle.goal.GoalExecutionException; import org.apache.maven.lifecycle.goal.MavenGoalExecutionContext; @@ -27,9 +25,11 @@ import org.apache.maven.plugin.PluginManager; import org.apache.maven.util.AbstractGoalVisitor; import org.apache.maven.util.GoalWalker; import org.apache.maven.util.GraphTraversalException; - import org.codehaus.plexus.util.dag.CycleDetectedException; +import java.util.HashSet; +import java.util.Set; + /** * @author jdcasey */ diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/GoalResolutionPhase.java b/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/GoalResolutionPhase.java index b3f514b257..05feae25a2 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/GoalResolutionPhase.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/GoalResolutionPhase.java @@ -1,26 +1,22 @@ package org.apache.maven.lifecycle.goal.phase; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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 java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; - import org.apache.maven.lifecycle.goal.AbstractMavenGoalPhase; import org.apache.maven.lifecycle.goal.GoalExecutionException; import org.apache.maven.lifecycle.goal.MavenGoalExecutionContext; @@ -30,6 +26,11 @@ import org.apache.maven.util.AbstractGoalVisitor; import org.apache.maven.util.GoalWalker; import org.apache.maven.util.GraphTraversalException; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; + /** * @author Jason van Zyl * @version $Id$ diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/PluginResolutionPhase.java b/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/PluginResolutionPhase.java index 9e81affcab..375a935c5d 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/PluginResolutionPhase.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/PluginResolutionPhase.java @@ -1,24 +1,22 @@ package org.apache.maven.lifecycle.goal.phase; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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 java.util.HashSet; -import java.util.Set; - import org.apache.maven.lifecycle.goal.AbstractMavenGoalPhase; import org.apache.maven.lifecycle.goal.GoalExecutionException; import org.apache.maven.lifecycle.goal.MavenGoalExecutionContext; @@ -28,6 +26,9 @@ import org.apache.maven.util.AbstractGoalVisitor; import org.apache.maven.util.GoalWalker; import org.apache.maven.util.GraphTraversalException; +import java.util.HashSet; +import java.util.Set; + /** * @author jdcasey */ diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/session/AbstractMavenSessionPhase.java b/maven-core/src/main/java/org/apache/maven/lifecycle/session/AbstractMavenSessionPhase.java index 4ad6b0ffaf..d028e79efa 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/session/AbstractMavenSessionPhase.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/session/AbstractMavenSessionPhase.java @@ -1,23 +1,22 @@ package org.apache.maven.lifecycle.session; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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.execution.MavenExecutionResponse; -import org.apache.maven.execution.MavenExecutionResponse; import org.codehaus.plexus.logging.AbstractLogEnabled; /** @@ -28,6 +27,4 @@ public abstract class AbstractMavenSessionPhase extends AbstractLogEnabled implements MavenSessionPhase { - public abstract MavenExecutionResponse execute( MavenSession context ) - throws Exception; } diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/session/DefaultMavenSessionPhaseManager.java b/maven-core/src/main/java/org/apache/maven/lifecycle/session/DefaultMavenSessionPhaseManager.java index 5f7cbcfae1..a9506dab1c 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/session/DefaultMavenSessionPhaseManager.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/session/DefaultMavenSessionPhaseManager.java @@ -1,22 +1,23 @@ package org.apache.maven.lifecycle.session; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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.execution.MavenExecutionResponse; +import org.apache.maven.execution.MavenExecutionRequest; import org.apache.maven.execution.MavenExecutionResponse; import org.codehaus.plexus.logging.AbstractLogEnabled; @@ -38,7 +39,7 @@ public class DefaultMavenSessionPhaseManager return lifecyclePhases; } - public MavenExecutionResponse execute( MavenSession session ) + public void execute( MavenExecutionRequest request, MavenExecutionResponse response ) throws Exception { for ( Iterator iterator = lifecyclePhases.iterator(); iterator.hasNext(); ) @@ -47,14 +48,12 @@ public class DefaultMavenSessionPhaseManager phase.enableLogging( getLogger() ); - MavenExecutionResponse response = phase.execute( session ); + phase.execute( request, response ); if ( response.isExecutionFailure() ) { - return response; + return; } } - - return new MavenExecutionResponse(); } } diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/session/MavenSession.java b/maven-core/src/main/java/org/apache/maven/lifecycle/session/MavenSession.java index b10d184dec..85662fe631 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/session/MavenSession.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/session/MavenSession.java @@ -1,5 +1,22 @@ package org.apache.maven.lifecycle.session; +/* ==================================================================== + * 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. + * ==================================================================== + */ + import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.model.PostGoal; import org.apache.maven.model.PreGoal; @@ -20,22 +37,6 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; -/* - * 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 Jason van Zyl * @version $Id$ @@ -62,7 +63,6 @@ public class MavenSession public MavenSession( PlexusContainer container, PluginManager pluginManager, - MavenProject project, ArtifactRepository localRepository, List goals ) { @@ -70,19 +70,11 @@ public class MavenSession this.pluginManager = pluginManager; - this.project = project; - this.localRepository = localRepository; this.dag = new DAG(); this.goals = goals; - - this.preGoalMappings = new TreeMap(); - - this.postGoalMappings = new TreeMap(); - - initGoalDecoratorMappings(); } public PlexusContainer getContainer() @@ -100,6 +92,21 @@ public class MavenSession return project; } + public void setProject( MavenProject project ) + { + this.project = project; + + // ---------------------------------------------------------------------- + // We only need these things to be done when we have a project. + // ---------------------------------------------------------------------- + + this.preGoalMappings = new TreeMap(); + + this.postGoalMappings = new TreeMap(); + + initGoalDecoratorMappings(); + } + public ArtifactRepository getLocalRepository() { return localRepository; @@ -151,15 +158,20 @@ public class MavenSession } } + //!! this should probably not be done here as there are request types that + // have no project + public List getPreGoals( String goal ) { List result = (List) preGoalMappings.get( goal ); + return result; } public List getPostGoals( String goal ) { List result = (List) postGoalMappings.get( goal ); + return result; } diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/session/MavenSessionPhase.java b/maven-core/src/main/java/org/apache/maven/lifecycle/session/MavenSessionPhase.java index a069901f61..0ede6d9a92 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/session/MavenSessionPhase.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/session/MavenSessionPhase.java @@ -1,21 +1,23 @@ package org.apache.maven.lifecycle.session; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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.execution.MavenExecutionRequest; import org.apache.maven.execution.MavenExecutionResponse; import org.codehaus.plexus.logging.Logger; @@ -27,7 +29,7 @@ public interface MavenSessionPhase { String ROLE = MavenSessionPhase.class.getName(); - MavenExecutionResponse execute( MavenSession context ) + void execute( MavenExecutionRequest request, MavenExecutionResponse response ) throws Exception; void enableLogging( Logger logger ); diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/session/MavenSessionPhaseManager.java b/maven-core/src/main/java/org/apache/maven/lifecycle/session/MavenSessionPhaseManager.java index 27f802da56..c855077280 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/session/MavenSessionPhaseManager.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/session/MavenSessionPhaseManager.java @@ -1,22 +1,23 @@ package org.apache.maven.lifecycle.session; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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.execution.MavenExecutionResponse; +import org.apache.maven.execution.MavenExecutionRequest; import org.apache.maven.execution.MavenExecutionResponse; import java.util.List; @@ -29,7 +30,7 @@ public interface MavenSessionPhaseManager { String ROLE = MavenSessionPhaseManager.class.getName(); - MavenExecutionResponse execute( MavenSession session ) + void execute( MavenExecutionRequest request, MavenExecutionResponse response ) throws Exception; List getLifecyclePhases(); diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/session/phase/GoalExecutionPhase.java b/maven-core/src/main/java/org/apache/maven/lifecycle/session/phase/GoalExecutionPhase.java index e67cc1547a..6e71072c78 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/session/phase/GoalExecutionPhase.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/session/phase/GoalExecutionPhase.java @@ -1,22 +1,23 @@ package org.apache.maven.lifecycle.session.phase; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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.execution.MavenExecutionResponse; +import org.apache.maven.execution.MavenExecutionRequest; import org.apache.maven.execution.MavenExecutionResponse; import org.apache.maven.lifecycle.goal.MavenGoalExecutionContext; import org.apache.maven.lifecycle.goal.MavenGoalPhaseManager; @@ -32,12 +33,12 @@ import java.util.Iterator; public class GoalExecutionPhase extends AbstractMavenSessionPhase { - public MavenExecutionResponse execute( MavenSession session ) + public void execute( MavenExecutionRequest request, MavenExecutionResponse response ) throws Exception { - MavenGoalPhaseManager lifecycleManager = (MavenGoalPhaseManager) session.lookup( MavenGoalPhaseManager.ROLE ); + MavenSession session = request.getSession(); - MavenExecutionResponse response = new MavenExecutionResponse(); + MavenGoalPhaseManager lifecycleManager = (MavenGoalPhaseManager) session.lookup( MavenGoalPhaseManager.ROLE ); for ( Iterator iterator = session.getGoals().iterator(); iterator.hasNext(); ) { @@ -58,7 +59,5 @@ public class GoalExecutionPhase break; } } - - return response; } } \ No newline at end of file diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java index 351f39abe9..84a902d60e 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java @@ -1,14 +1,20 @@ package org.apache.maven.plugin; -/* - * 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-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. + * ==================================================================== */ import org.apache.maven.artifact.Artifact; @@ -19,10 +25,10 @@ import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.artifact.resolver.filter.ArtifactFilter; import org.apache.maven.artifact.resolver.filter.ExclusionSetFilter; +import org.apache.maven.lifecycle.session.MavenSession; import org.apache.maven.plugin.descriptor.MojoDescriptor; import org.apache.maven.plugin.descriptor.PluginDescriptor; import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder; -import org.apache.maven.lifecycle.session.MavenSession; import org.codehaus.plexus.ArtifactEnabledContainer; import org.codehaus.plexus.PlexusConstants; import org.codehaus.plexus.PlexusContainer; diff --git a/maven-core/src/main/java/org/apache/maven/plugin/MavenMojoDescriptor.java b/maven-core/src/main/java/org/apache/maven/plugin/MavenMojoDescriptor.java index 05cef73930..87ab906029 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/MavenMojoDescriptor.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/MavenMojoDescriptor.java @@ -1,19 +1,20 @@ package org.apache.maven.plugin; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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.plugin.descriptor.MojoDescriptor; diff --git a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDependency.java b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDependency.java index dadc665b8e..3134780363 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDependency.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDependency.java @@ -1,5 +1,22 @@ package org.apache.maven.plugin; +/* ==================================================================== + * 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. + * ==================================================================== + */ + import org.apache.maven.plugin.descriptor.Dependency; import org.codehaus.plexus.component.repository.ComponentDependency; diff --git a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDescriptor.java b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDescriptor.java index a657db096c..e678cd4fa0 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDescriptor.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDescriptor.java @@ -1,19 +1,20 @@ package org.apache.maven.plugin; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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.plugin.descriptor.PluginDescriptor; diff --git a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDiscoverer.java b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDiscoverer.java index 16a0a6668c..baba48ce46 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDiscoverer.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDiscoverer.java @@ -1,19 +1,20 @@ package org.apache.maven.plugin; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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.plugin.descriptor.Dependency; diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginConfigurationException.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginConfigurationException.java index b0971174ab..e4a772da86 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/PluginConfigurationException.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginConfigurationException.java @@ -1,19 +1,20 @@ package org.apache.maven.plugin; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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. + * ==================================================================== */ /** diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java index e1ae83e256..b16d43daf1 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java @@ -1,19 +1,20 @@ package org.apache.maven.plugin; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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.lifecycle.session.MavenSession; diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java index 3e29d36635..d4db81b262 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java @@ -1,19 +1,20 @@ package org.apache.maven.plugin; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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.lifecycle.goal.MavenGoalExecutionContext; diff --git a/maven-core/src/main/java/org/apache/maven/plugin/ReflectionProjectValueExtractor.java b/maven-core/src/main/java/org/apache/maven/plugin/ReflectionProjectValueExtractor.java index b2694ed53c..cdd27307a7 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/ReflectionProjectValueExtractor.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/ReflectionProjectValueExtractor.java @@ -1,13 +1,30 @@ package org.apache.maven.plugin; -import org.apache.maven.util.introspection.ClassMap; +/* ==================================================================== + * 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. + * ==================================================================== + */ + import org.apache.maven.project.MavenProject; +import org.apache.maven.util.introspection.ClassMap; import org.codehaus.plexus.util.StringUtils; -import java.util.StringTokenizer; -import java.util.Map; -import java.util.HashMap; import java.lang.reflect.Method; +import java.util.HashMap; +import java.util.Map; +import java.util.StringTokenizer; /** * Using simple dotted expressions extract the values from a MavenProject diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java index f51bbdbc1a..cde99ca865 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java @@ -1,19 +1,20 @@ package org.apache.maven.project; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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.MavenConstants; diff --git a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java index 191e525ab6..dad082415b 100644 --- a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java +++ b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java @@ -1,19 +1,20 @@ package org.apache.maven.project; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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; diff --git a/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java index dcf5be1ca1..0d1510347e 100644 --- a/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java @@ -1,19 +1,20 @@ package org.apache.maven.project; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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.ArtifactRepository; diff --git a/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuildingResult.java b/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuildingResult.java index bd71e18b1f..d82d8f108f 100644 --- a/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuildingResult.java +++ b/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuildingResult.java @@ -1,19 +1,20 @@ package org.apache.maven.project; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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.project.validation.ModelValidationResult; diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java index c56417a5e7..776687c0e6 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java +++ b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java @@ -1,19 +1,20 @@ package org.apache.maven.project; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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. + * ==================================================================== */ /** diff --git a/maven-core/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java b/maven-core/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java index bd94d00e6e..218583f787 100644 --- a/maven-core/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java +++ b/maven-core/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java @@ -1,24 +1,22 @@ package org.apache.maven.project.inheritance; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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 java.util.Iterator; -import java.util.List; - import org.apache.maven.model.Dependency; import org.apache.maven.model.Model; import org.apache.maven.model.Plugin; @@ -26,9 +24,11 @@ import org.apache.maven.model.PostGoal; import org.apache.maven.model.PreGoal; import org.apache.maven.model.Repository; import org.apache.maven.model.Scm; - import org.codehaus.plexus.util.StringUtils; +import java.util.Iterator; +import java.util.List; + /** * @author Jason van Zyl * @version $Id: DefaultModelInheritanceAssembler.java,v 1.4 2004/08/23 20:24:54 diff --git a/maven-core/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java b/maven-core/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java index 9c45d5181d..f6b2b4da5b 100644 --- a/maven-core/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java +++ b/maven-core/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java @@ -1,19 +1,20 @@ package org.apache.maven.project.inheritance; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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.model.Model; diff --git a/maven-core/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java b/maven-core/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java index ee227293d5..f6d77d6e73 100644 --- a/maven-core/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java +++ b/maven-core/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java @@ -1,19 +1,20 @@ package org.apache.maven.project.path; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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.model.Build; diff --git a/maven-core/src/main/java/org/apache/maven/project/path/PathTranslator.java b/maven-core/src/main/java/org/apache/maven/project/path/PathTranslator.java index 86c46379c8..9e5c66e6cf 100644 --- a/maven-core/src/main/java/org/apache/maven/project/path/PathTranslator.java +++ b/maven-core/src/main/java/org/apache/maven/project/path/PathTranslator.java @@ -1,25 +1,26 @@ package org.apache.maven.project.path; +/* ==================================================================== + * 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. + * ==================================================================== + */ + import org.apache.maven.model.Model; import java.io.File; -/* - * 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 Jason van Zyl * @version $Id$ diff --git a/maven-core/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java b/maven-core/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java index 7ff56dd632..d2e1d3875b 100644 --- a/maven-core/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java +++ b/maven-core/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java @@ -1,19 +1,20 @@ package org.apache.maven.project.validation; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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.model.Dependency; diff --git a/maven-core/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java b/maven-core/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java index 16ca2488fb..7be19037ba 100644 --- a/maven-core/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java +++ b/maven-core/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java @@ -1,19 +1,20 @@ package org.apache.maven.project.validation; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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 java.util.ArrayList; diff --git a/maven-core/src/main/java/org/apache/maven/project/validation/ModelValidator.java b/maven-core/src/main/java/org/apache/maven/project/validation/ModelValidator.java index 1bbd98137a..7e43d50345 100644 --- a/maven-core/src/main/java/org/apache/maven/project/validation/ModelValidator.java +++ b/maven-core/src/main/java/org/apache/maven/project/validation/ModelValidator.java @@ -1,19 +1,20 @@ package org.apache.maven.project.validation; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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.model.Model; diff --git a/maven-core/src/main/java/org/apache/maven/reactor/ReactorException.java b/maven-core/src/main/java/org/apache/maven/reactor/ReactorException.java index 7257b871d5..dd9a8e0199 100644 --- a/maven-core/src/main/java/org/apache/maven/reactor/ReactorException.java +++ b/maven-core/src/main/java/org/apache/maven/reactor/ReactorException.java @@ -1,19 +1,20 @@ package org.apache.maven.reactor; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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. + * ==================================================================== */ /** diff --git a/maven-core/src/main/java/org/apache/maven/repository/RepositoryUtils.java b/maven-core/src/main/java/org/apache/maven/repository/RepositoryUtils.java index ccd7b2d1d6..1b1b015e9d 100644 --- a/maven-core/src/main/java/org/apache/maven/repository/RepositoryUtils.java +++ b/maven-core/src/main/java/org/apache/maven/repository/RepositoryUtils.java @@ -1,5 +1,22 @@ package org.apache.maven.repository; +/* ==================================================================== + * 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. + * ==================================================================== + */ + import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.model.Repository; diff --git a/maven-core/src/main/java/org/apache/maven/util/AbstractGoalVisitor.java b/maven-core/src/main/java/org/apache/maven/util/AbstractGoalVisitor.java index 1212ad77bd..1d596b93de 100644 --- a/maven-core/src/main/java/org/apache/maven/util/AbstractGoalVisitor.java +++ b/maven-core/src/main/java/org/apache/maven/util/AbstractGoalVisitor.java @@ -1,19 +1,20 @@ package org.apache.maven.util; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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.lifecycle.session.MavenSession; diff --git a/maven-core/src/main/java/org/apache/maven/util/GoalVisitor.java b/maven-core/src/main/java/org/apache/maven/util/GoalVisitor.java index 79752630b3..d8e0e846bb 100644 --- a/maven-core/src/main/java/org/apache/maven/util/GoalVisitor.java +++ b/maven-core/src/main/java/org/apache/maven/util/GoalVisitor.java @@ -1,19 +1,20 @@ package org.apache.maven.util; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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.lifecycle.session.MavenSession; diff --git a/maven-core/src/main/java/org/apache/maven/util/GoalWalker.java b/maven-core/src/main/java/org/apache/maven/util/GoalWalker.java index eafc3d274b..5e7c6065f0 100644 --- a/maven-core/src/main/java/org/apache/maven/util/GoalWalker.java +++ b/maven-core/src/main/java/org/apache/maven/util/GoalWalker.java @@ -1,28 +1,29 @@ package org.apache.maven.util; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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 java.util.Iterator; -import java.util.List; - import org.apache.maven.lifecycle.session.MavenSession; import org.apache.maven.plugin.PluginManager; import org.apache.maven.plugin.descriptor.MojoDescriptor; +import java.util.Iterator; +import java.util.List; + /** * @author jdcasey */ diff --git a/maven-core/src/main/java/org/apache/maven/util/GraphTraversalException.java b/maven-core/src/main/java/org/apache/maven/util/GraphTraversalException.java index 6303b7d627..e999f639d8 100644 --- a/maven-core/src/main/java/org/apache/maven/util/GraphTraversalException.java +++ b/maven-core/src/main/java/org/apache/maven/util/GraphTraversalException.java @@ -1,19 +1,20 @@ package org.apache.maven.util; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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. + * ==================================================================== */ /** diff --git a/maven-core/src/main/java/org/apache/maven/util/introspection/ClassMap.java b/maven-core/src/main/java/org/apache/maven/util/introspection/ClassMap.java index 75ab1646b7..b337ba85a0 100644 --- a/maven-core/src/main/java/org/apache/maven/util/introspection/ClassMap.java +++ b/maven-core/src/main/java/org/apache/maven/util/introspection/ClassMap.java @@ -1,19 +1,20 @@ package org.apache.maven.util.introspection; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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 java.lang.reflect.Method; diff --git a/maven-core/src/main/java/org/apache/maven/util/introspection/MethodMap.java b/maven-core/src/main/java/org/apache/maven/util/introspection/MethodMap.java index 21a8ad711a..34b7d4538a 100644 --- a/maven-core/src/main/java/org/apache/maven/util/introspection/MethodMap.java +++ b/maven-core/src/main/java/org/apache/maven/util/introspection/MethodMap.java @@ -1,31 +1,29 @@ package org.apache.maven.util.introspection; -/* - * Copyright 2001-2004 The Apache Software Foundation. +/* ==================================================================== + * 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 + * 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 java.util.Iterator; -import java.util.List; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.Set; -import java.util.HashSet; -import java.util.Map; -import java.util.Hashtable; - import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; /** * diff --git a/maven-core/src/test/java/org/apache/maven/MavenTestCase.java b/maven-core/src/test/java/org/apache/maven/MavenTestCase.java index 878745f4f9..7be182471e 100644 --- a/maven-core/src/test/java/org/apache/maven/MavenTestCase.java +++ b/maven-core/src/test/java/org/apache/maven/MavenTestCase.java @@ -123,12 +123,15 @@ public class MavenTestCase return createGoalExecutionContext( project, getLocalRepository(), goal ); } - protected MavenGoalExecutionContext createGoalExecutionContext( MavenProject project, - ArtifactRepository localRepository, String goal ) + protected MavenGoalExecutionContext createGoalExecutionContext( MavenProject project, + ArtifactRepository localRepository, + String goal ) { List goals = new ArrayList(); - MavenSession session = new MavenSession( getContainer(), pluginManager, project, localRepository, goals ); + MavenSession session = new MavenSession( getContainer(), pluginManager, localRepository, goals ); + + session.setProject( project ); MavenGoalExecutionContext context = new MavenGoalExecutionContext( session, goal );