reformat, apply license

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169548 13f79535-47bb-0310-9956-ffa450edef68

maven-core/src/main/java/org/apache/maven/DefaultMaven.java

@@ -1,20 +1,19 @@
 package org.apache.maven;
 
-/* ====================================================================
- *   Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
  *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 import org.apache.maven.artifact.manager.WagonManager;
@@ -75,7 +74,7 @@ public class DefaultMaven
     protected LifecycleExecutor lifecycleExecutor;
 
     protected PlexusContainer container;
-    
+
     protected Map errorDiagnosers;
 
     // ----------------------------------------------------------------------
@@ -380,22 +379,22 @@ public class DefaultMaven
         getLogger().info( "BUILD FAILURE" );
 
         line();
-        
+
         String message = null;
-        if(errorDiagnosers != null)
+        if ( errorDiagnosers != null )
         {
             for ( Iterator it = errorDiagnosers.values().iterator(); it.hasNext(); )
             {
                 ErrorDiagnoser diagnoser = (ErrorDiagnoser) it.next();
-                
-                if( diagnoser.canDiagnose( e ) )
+
+                if ( diagnoser.canDiagnose( e ) )
                 {
                     message = diagnoser.diagnose( e );
                 }
             }
         }
-        
-        if( message == null )
+
+        if ( message == null )
         {
             message = "Reason: " + e.getMessage();
         }
@@ -403,7 +402,7 @@ public class DefaultMaven
         getLogger().info( message );
 
         line();
-        
+
         if ( longMessage != null )
         {
             getLogger().info( longMessage );

maven-core/src/main/java/org/apache/maven/Maven.java

@@ -1,7 +1,7 @@
 package org.apache.maven;
 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2005 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,5 +28,6 @@ public interface Maven
 {
     static String ROLE = Maven.class.getName();
 
-    MavenExecutionResponse execute( MavenExecutionRequest request ) throws ReactorException;
+    MavenExecutionResponse execute( MavenExecutionRequest request )
+        throws ReactorException;
 }

maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java

@@ -1,20 +1,19 @@
 package org.apache.maven.cli;
 
-/* ====================================================================
- *   Copyright 2001-2005 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
  *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 import org.apache.maven.wagon.WagonConstants;
@@ -62,8 +61,9 @@ public class ConsoleDownloadMonitor
 
     public void transferCompleted( TransferEvent transferEvent )
     {
-        System.out.println( ( complete / 1024 ) + "K " +
-                            ( transferEvent.getRequestType() == TransferEvent.REQUEST_PUT ? "uploaded" : "downloaded" ) );
+        System.out.println(
+            ( complete / 1024 ) + "K " +
+            ( transferEvent.getRequestType() == TransferEvent.REQUEST_PUT ? "uploaded" : "downloaded" ) );
     }
 
     public void transferError( TransferEvent transferEvent )

maven-core/src/main/java/org/apache/maven/cli/MavenCli.java

@@ -36,15 +36,14 @@ import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 import org.apache.maven.monitor.event.DefaultEventDispatcher;
 import org.apache.maven.monitor.event.DefaultEventMonitor;
 import org.apache.maven.monitor.event.EventDispatcher;
-import org.apache.maven.monitor.logging.DefaultLog;
 import org.apache.maven.plugin.Mojo;
 import org.apache.maven.reactor.ReactorException;
 import org.apache.maven.settings.MavenSettingsBuilder;
 import org.apache.maven.settings.Settings;
 import org.codehaus.classworlds.ClassWorld;
 import org.codehaus.plexus.PlexusContainerException;
-import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException;
+import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 import org.codehaus.plexus.embed.ArtifactEnabledEmbedder;
 import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.logging.LoggerManager;
@@ -121,9 +120,9 @@ public class MavenCli
 
         boolean showErrors = debug || commandLine.hasOption( CLIManager.ERRORS );
 
-        if(showErrors)
+        if ( showErrors )
         {
-            System.out.println("+ Error stacktraces are turned on.");
+            System.out.println( "+ Error stacktraces are turned on." );
         }
 
         // ----------------------------------------------------------------------
@@ -267,8 +266,8 @@ public class MavenCli
         System.err.println( "FATAL ERROR: " + message );
         if ( show )
         {
-            System.err.println("Error stacktrace:");
-            
+            System.err.println( "Error stacktrace:" );
+
             e.printStackTrace();
         }
         else
@@ -465,7 +464,7 @@ public class MavenCli
         public static final char REACTOR = 'r';
 
         public static final char DEBUG = 'X';
-        
+
         // TODO: [jc] Is there a better switch than '-e' for this?
         public static final char ERRORS = 'e';
 
@@ -496,8 +495,8 @@ public class MavenCli
                 VERSION ) );
             options.addOption( OptionBuilder.withLongOpt( "debug" ).withDescription( "Produce execution debug output" ).create(
                 DEBUG ) );
-            options.addOption( OptionBuilder.withLongOpt( "errors" ).withDescription( "Produce execution error messages" ).create(
-                ERRORS ) );
+            options.addOption( OptionBuilder.withLongOpt( "errors" ).withDescription(
+                "Produce execution error messages" ).create( ERRORS ) );
             options.addOption( OptionBuilder.withLongOpt( "reactor" ).withDescription(
                 "Execute goals for project found in the reactor" ).create( REACTOR ) );
             options.addOption( OptionBuilder.withLongOpt( "non-recursive" ).withDescription(

maven-core/src/main/java/org/apache/maven/exception/MavenExceptionHandler.java

@@ -1,20 +1,19 @@
 package org.apache.maven.exception;
 
-/* ====================================================================
- *   Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
  *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 /**
@@ -29,7 +28,6 @@ package org.apache.maven.exception;
  * o non existent goals
  *
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
- * 
  * @version $Id$
  */
 public class MavenExceptionHandler

maven-core/src/main/java/org/apache/maven/exception/MavenHomeNotDefinedException.java

@@ -1,25 +1,23 @@
 package org.apache.maven.exception;
 
-/* ====================================================================
- *   Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
  *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 /**
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
- * 
  * @version $Id$
  */
 public class MavenHomeNotDefinedException

maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java

@@ -1,20 +1,19 @@
 package org.apache.maven.execution;
 
-/* ====================================================================
- *   Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
  *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 import org.apache.maven.artifact.repository.ArtifactRepository;

maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java

@@ -1,20 +1,19 @@
 package org.apache.maven.execution;
 
-/* ====================================================================
- *   Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
  *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 import org.apache.maven.artifact.repository.ArtifactRepository;

maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResponse.java

@@ -1,20 +1,19 @@
 package org.apache.maven.execution;
 
-/* ====================================================================
- *   Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
  *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 import java.util.Date;

maven-core/src/main/java/org/apache/maven/execution/MavenSession.java

@@ -1,20 +1,19 @@
 package org.apache.maven.execution;
 
-/* ====================================================================
- *   Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
  *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -53,7 +52,7 @@ public class MavenSession
         this.project = project;
 
         this.container = container;
-        
+
         this.settings = settings;
 
         this.localRepository = localRepository;
@@ -71,7 +70,7 @@ public class MavenSession
     private void initializeContainerContext()
     {
         Context context = container.getContext();
-        
+
         context.put( "project", project );
         context.put( "settings", settings );
         context.put( "basedir", project.getBasedir().getAbsolutePath() );

maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java

@@ -1,20 +1,19 @@
 package org.apache.maven.lifecycle;
 
-/* ====================================================================
- *   Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
  *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 /**

maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java

@@ -1,27 +1,26 @@
 package org.apache.maven.lifecycle;
 
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import org.apache.maven.execution.MavenExecutionResponse;
 import org.apache.maven.execution.MavenSession;
 
 import java.util.List;
 
-/* ====================================================================
- *   Copyright 2001-2004 The Apache Software Foundation.
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- * ====================================================================
- */
-
 /**
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
  * @version $Id$

maven-core/src/main/java/org/apache/maven/lifecycle/LifecyclePhaseConstants.java

@@ -1,20 +1,19 @@
 package org.apache.maven.lifecycle;
 
-/* ====================================================================
- *   Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
  *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 /**

maven-core/src/main/java/org/apache/maven/lifecycle/Phase.java

@@ -1,25 +1,24 @@
 package org.apache.maven.lifecycle;
 
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import java.util.HashSet;
 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.
- * ====================================================================
- */
-
 /**
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
  * @version $Id$

maven-core/src/main/java/org/apache/maven/monitor/event/DefaultEventMonitor.java

@@ -1,5 +1,21 @@
 package org.apache.maven.monitor.event;
 
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import org.codehaus.plexus.logging.Logger;
 
 /**
@@ -8,17 +24,15 @@ import org.codehaus.plexus.logging.Logger;
 public class DefaultEventMonitor
     extends AbstractSelectiveEventMonitor
 {
-    
-    private static final String[] START_EVENTS = {
-        MavenEvents.MOJO_EXECUTION
-    };
-    
+
+    private static final String[] START_EVENTS = {MavenEvents.MOJO_EXECUTION};
+
     private final Logger logger;
 
     public DefaultEventMonitor( Logger logger )
     {
         super( START_EVENTS, MavenEvents.NO_EVENTS, MavenEvents.NO_EVENTS );
-        
+
         this.logger = logger;
     }
 

maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDiscoverer.java

@@ -1,20 +1,19 @@
 package org.apache.maven.plugin;
 
-/* ====================================================================
- *   Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
  *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder;

maven-core/src/main/java/org/apache/maven/plugin/PluginConfigurationException.java

@@ -1,20 +1,19 @@
 package org.apache.maven.plugin;
 
-/* ====================================================================
- *   Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
  *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 /**

maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java

@@ -1,20 +1,19 @@
 package org.apache.maven.plugin;
 
-/* ====================================================================
- *   Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
  *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;

maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java

@@ -1,9 +1,5 @@
 package org.apache.maven.plugin;
 
-import org.apache.maven.plugin.descriptor.MojoDescriptor;
-
-import java.util.List;
-
 /*
  * Copyright 2001-2005 The Apache Software Foundation.
  *
@@ -20,36 +16,41 @@ import java.util.List;
  * limitations under the License.
  */
 
+import org.apache.maven.plugin.descriptor.MojoDescriptor;
+
+import java.util.List;
+
 public class PluginParameterException
     extends PluginConfigurationException
 {
 
     private final List parameters;
+
     private final MojoDescriptor mojo;
 
     public PluginParameterException( MojoDescriptor mojo, List parameters )
     {
         super( "Invalid or missing parameters: " + parameters + " for mojo: " + mojo.getRoleHint() );
-        
+
         this.mojo = mojo;
-        
+
         this.parameters = parameters;
     }
 
     public PluginParameterException( MojoDescriptor mojo, List parameters, Throwable cause )
     {
         super( "Invalid or missing parameters: " + parameters + " for mojo: " + mojo.getRoleHint(), cause );
-        
+
         this.mojo = mojo;
-        
+
         this.parameters = parameters;
     }
-    
+
     public MojoDescriptor getMojoDescriptor()
     {
         return mojo;
     }
-    
+
     public List getParameters()
     {
         return parameters;

maven-core/src/main/java/org/apache/maven/reactor/ReactorException.java

@@ -1,20 +1,19 @@
 package org.apache.maven.reactor;
 
-/* ====================================================================
- *   Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
  *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 /**

maven-core/src/main/java/org/apache/maven/usability/ArtifactResolverDiagnoser.java

@@ -1,9 +1,5 @@
 package org.apache.maven.usability;
 
-import org.apache.maven.artifact.resolver.ArtifactResolutionException;
-import org.apache.maven.artifact.resolver.TransitiveArtifactResolutionException;
-import org.apache.maven.project.ProjectBuildingException;
-
 /*
  * Copyright 2001-2005 The Apache Software Foundation.
  *
@@ -20,6 +16,10 @@ import org.apache.maven.project.ProjectBuildingException;
  * limitations under the License.
  */
 
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.artifact.resolver.TransitiveArtifactResolutionException;
+import org.apache.maven.project.ProjectBuildingException;
+
 public class ArtifactResolverDiagnoser
     implements ErrorDiagnoser
 {
@@ -41,8 +41,8 @@ public class ArtifactResolverDiagnoser
 
             if ( causalityChainContains( error, TransitiveArtifactResolutionException.class ) )
             {
-                messageBuffer
-                    .append( "Error while transitively resolving artifacts (transitive path trace currently unavailable):\n\n" );
+                messageBuffer.append(
+                    "Error while transitively resolving artifacts (transitive path trace currently unavailable):\n\n" );
             }
             else
             {

maven-core/src/main/java/org/apache/maven/usability/ErrorDiagnoser.java

@@ -19,9 +19,9 @@ package org.apache.maven.usability;
 public interface ErrorDiagnoser
 {
     public static final String ROLE = ErrorDiagnoser.class.getName();
-    
+
     public boolean canDiagnose( Throwable error );
-    
+
     public String diagnose( Throwable error );
 
 }

maven-core/src/main/java/org/apache/maven/usability/PluginConfigurationDiagnoser.java

@@ -1,19 +1,5 @@
 package org.apache.maven.usability;
 
-import org.apache.maven.plugin.PluginConfigurationException;
-import org.apache.maven.plugin.PluginParameterException;
-import org.apache.maven.plugin.descriptor.MojoDescriptor;
-import org.apache.maven.plugin.descriptor.Parameter;
-import org.codehaus.plexus.util.StringUtils;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Stack;
-import java.util.StringTokenizer;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 /*
  * Copyright 2001-2005 The Apache Software Foundation.
  *
@@ -30,6 +16,20 @@ import java.util.regex.Pattern;
  * limitations under the License.
  */
 
+import org.apache.maven.plugin.PluginConfigurationException;
+import org.apache.maven.plugin.PluginParameterException;
+import org.apache.maven.plugin.descriptor.MojoDescriptor;
+import org.apache.maven.plugin.descriptor.Parameter;
+import org.codehaus.plexus.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Stack;
+import java.util.StringTokenizer;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 public class PluginConfigurationDiagnoser
     implements ErrorDiagnoser
 {
@@ -73,9 +73,8 @@ public class PluginConfigurationDiagnoser
         List params = exception.getParameters();
         MojoDescriptor mojo = exception.getMojoDescriptor();
 
-        messageBuffer.append( "One or more required plugin parameters are invalid/missing for \'" )
-            .append( mojo.getPluginDescriptor().getGoalPrefix() ).append( ":" ).append( mojo.getGoal() )
-            .append( "\'\n" );
+        messageBuffer.append( "One or more required plugin parameters are invalid/missing for \'" ).append(
+            mojo.getPluginDescriptor().getGoalPrefix() ).append( ":" ).append( mojo.getGoal() ).append( "\'\n" );
 
         int idx = 0;
         for ( Iterator it = params.iterator(); it.hasNext(); )
@@ -93,7 +92,7 @@ public class PluginConfigurationDiagnoser
     }
 
     private void decomposeParameterIntoUserInstructions( MojoDescriptor mojo, Parameter param,
-                                                        StringBuffer messageBuffer )
+                                                         StringBuffer messageBuffer )
     {
         String expression = param.getExpression();
 
@@ -107,8 +106,8 @@ public class PluginConfigurationDiagnoser
                 messageBuffer.append( " (aliased as: <" + alias + ">VALUE</" + alias + ">)" );
             }
 
-            messageBuffer.append( "\n    inside the <configuration/> section for "
-                + mojo.getPluginDescriptor().getArtifactId() );
+            messageBuffer.append( "\n    inside the <configuration/> section for " +
+                                  mojo.getPluginDescriptor().getArtifactId() );
         }
 
         if ( StringUtils.isEmpty( expression ) )
@@ -149,8 +148,8 @@ public class PluginConfigurationDiagnoser
                 }
                 else if ( "reports".equals( firstPart ) )
                 {
-                    expressionMessageBuffer
-                        .append( "make sure the <reports/> section of the pom.xml contains valid report names\n" );
+                    expressionMessageBuffer.append(
+                        "make sure the <reports/> section of the pom.xml contains valid report names\n" );
                 }
                 else if ( UNMODIFIABLE_EXPRESSIONS.contains( subExpression ) )
                 {
@@ -158,8 +157,8 @@ public class PluginConfigurationDiagnoser
                 }
                 else
                 {
-                    expressionMessageBuffer.append( "Please provide the system property: " ).append( subExpression )
-                        .append( "\n    (specified as \'-D" + subExpression + "=VALUE\' on the command line)\n" );
+                    expressionMessageBuffer.append( "Please provide the system property: " ).append( subExpression ).append(
+                        "\n    (specified as \'-D" + subExpression + "=VALUE\' on the command line)\n" );
                 }
             }
 
@@ -169,8 +168,8 @@ public class PluginConfigurationDiagnoser
             }
             else
             {
-                messageBuffer.append( "    (found static expression: \'" + expression
-                    + "\' which may act as a default value).\n" );
+                messageBuffer.append( "    (found static expression: \'" + expression +
+                                      "\' which may act as a default value).\n" );
             }
 
             if ( unmodifiableElementsFound )
@@ -180,11 +179,10 @@ public class PluginConfigurationDiagnoser
                     messageBuffer.append( "    " );
                 }
 
-                messageBuffer
-                    .append( "NOTE: One or more purely derived expression elements were detected in \'"
-                        + expression
-                        + "\'.\n    If you continue to get this error after any other expression elements are specified correctly,"
-                        + "\n    please report this issue to the Maven development team.\n" );
+                messageBuffer.append( "NOTE: One or more purely derived expression elements were detected in \'" +
+                                      expression +
+                                      "\'.\n    If you continue to get this error after any other expression elements are specified correctly," +
+                                      "\n    please report this issue to the Maven development team.\n" );
             }
         }
     }

maven-core/src/test/java/org/apache/maven/MavenTestUtils.java

@@ -1,7 +1,7 @@
 package org.apache.maven;
 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2005 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,16 +16,16 @@ package org.apache.maven;
  * limitations under the License.
  */
 
-import java.io.File;
-
 import org.codehaus.classworlds.ClassRealm;
 import org.codehaus.classworlds.ClassWorld;
 import org.codehaus.plexus.DefaultArtifactEnabledContainer;
 import org.codehaus.plexus.PlexusContainer;
 
+import java.io.File;
+
 /**
  * This is a utility class for helping to configure a PlexusTestCase for testing with maven.
- * 
+ *
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
  */

maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java

@@ -22,7 +22,6 @@ import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Build;
 import org.apache.maven.model.Model;
 import org.apache.maven.monitor.event.DefaultEventDispatcher;
-import org.apache.maven.monitor.logging.DefaultLog;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.settings.Settings;
 import org.codehaus.plexus.PlexusContainer;
@@ -65,7 +64,8 @@ public class PluginParameterExpressionEvaluatorTest
     private static MavenSession createSession( MavenProject project, PlexusContainer container,
                                                ArtifactRepository repo )
     {
-        return new MavenSession( project, container, new Settings(), repo, new DefaultEventDispatcher(), Collections.EMPTY_LIST );
+        return new MavenSession( project, container, new Settings(), repo, new DefaultEventDispatcher(),
+                                 Collections.EMPTY_LIST );
     }
 
     public void testLocalRepositoryExtraction()
@@ -87,7 +87,6 @@ public class PluginParameterExpressionEvaluatorTest
         Model model = new Model();
         model.setBuild( build );
 
-
         ExpressionEvaluator expressionEvaluator = createExpressionEvaluator( new MavenProject( model ) );
 
         Object value = expressionEvaluator.evaluate( "${project.build.directory}/${project.build.finalName}" );
@@ -111,7 +110,8 @@ public class PluginParameterExpressionEvaluatorTest
         PlexusContainer container = getContainer();
         MavenSession session = createSession( project, container, repo );
 
-        ExpressionEvaluator expressionEvaluator = new PluginParameterExpressionEvaluator( session, null, container.getLogger() );
+        ExpressionEvaluator expressionEvaluator = new PluginParameterExpressionEvaluator( session, null,
+                                                                                          container.getLogger() );
         return expressionEvaluator;
     }
 }

maven-core/src/test/java/org/apache/maven/usability/PluginErrorDiagnoserTest.java

@@ -1,17 +1,5 @@
 package org.apache.maven.usability;
 
-import org.apache.maven.plugin.PluginParameterException;
-import org.apache.maven.plugin.descriptor.DuplicateParameterException;
-import org.apache.maven.plugin.descriptor.MojoDescriptor;
-import org.apache.maven.plugin.descriptor.Parameter;
-import org.apache.maven.plugin.descriptor.PluginDescriptor;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import junit.framework.TestCase;
-
 /*
  * Copyright 2001-2005 The Apache Software Foundation.
  *
@@ -28,6 +16,17 @@ import junit.framework.TestCase;
  * limitations under the License.
  */
 
+import junit.framework.TestCase;
+import org.apache.maven.plugin.PluginParameterException;
+import org.apache.maven.plugin.descriptor.DuplicateParameterException;
+import org.apache.maven.plugin.descriptor.MojoDescriptor;
+import org.apache.maven.plugin.descriptor.Parameter;
+import org.apache.maven.plugin.descriptor.PluginDescriptor;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 public class PluginErrorDiagnoserTest
     extends TestCase
 {
@@ -224,9 +223,9 @@ public class PluginErrorDiagnoserTest
     {
         IllegalArgumentException marker = new IllegalArgumentException();
 
-        System.out.println( "---------------------------------------------------------------------\n"
-            + "Visual output for " + marker.getStackTrace()[1].getMethodName()
-            + ":\n---------------------------------------------------------------------" );
+        System.out.println( "---------------------------------------------------------------------\n" +
+                            "Visual output for " + marker.getStackTrace()[1].getMethodName() +
+                            ":\n---------------------------------------------------------------------" );
     }
 
 }