Modified: maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java?rev=958295&r1=958294&r2=958295&view=diff ============================================================================== --- maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java (original) +++ maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java Sat Jun 26 23:16:18 2010 @@ -1,18 +1,22 @@ package org.apache.maven.cli; /* - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license - * agreements. See the NOTICE file distributed with this work for additional information regarding - * copyright ownership. The ASF licenses this file to you 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. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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; @@ -79,7 +83,8 @@ public class MavenCli public static final File DEFAULT_USER_SETTINGS_FILE = new File( userMavenConfigurationHome, "settings.xml" ); - public static final File DEFAULT_GLOBAL_SETTINGS_FILE = new File( System.getProperty( "maven.home", System.getProperty( "user.dir", "" ) ), "conf/settings.xml" ); + public static final File DEFAULT_GLOBAL_SETTINGS_FILE = + new File( System.getProperty( "maven.home", System.getProperty( "user.dir", "" ) ), "conf/settings.xml" ); public static final File DEFAULT_USER_TOOLCHAINS_FILE = new File( userMavenConfigurationHome, "toolchains.xml" ); @@ -96,8 +101,8 @@ public class MavenCli private MavenExecutionRequestPopulator executionRequestPopulator; - private SettingsBuilder settingsBuilder; - + private SettingsBuilder settingsBuilder; + private DefaultSecDispatcher dispatcher; public MavenCli() @@ -172,7 +177,7 @@ public class MavenCli catch ( Exception e ) { CLIReportingUtils.showError( logger, "Error executing Maven.", e, cliRequest.showErrors ); - + return 1; } finally @@ -208,19 +213,19 @@ public class MavenCli { cliRequest.workingDirectory = System.getProperty( "user.dir" ); } - + // // Make sure the Maven home directory is an absolute path to save us from confusion with say drive-relative // Windows paths. // String mavenHome = System.getProperty( "maven.home" ); - + if ( mavenHome != null ) { System.setProperty( "maven.home", new File( mavenHome ).getAbsolutePath() ); } } - + // // Logging needs to be handled in a standard way at the container level. // @@ -239,7 +244,8 @@ public class MavenCli // TODO: we need to do some more work here. Some plugins use sys out or log errors at info level. // Ideally, we could use Warn across the board cliRequest.request.setLoggingLevel( MavenExecutionRequest.LOGGING_LEVEL_ERROR ); - // TODO:Additionally, we can't change the mojo level because the component key includes the version and it isn't known ahead of time. This seems worth changing. + // TODO:Additionally, we can't change the mojo level because the component key includes the version and + // it isn't known ahead of time. This seems worth changing. } else { @@ -268,10 +274,10 @@ public class MavenCli { logger.setStream( cliRequest.stdout ); } - - cliRequest.request.setExecutionListener( new ExecutionEventLogger( logger ) ); + + cliRequest.request.setExecutionListener( new ExecutionEventLogger( logger ) ); } - + // // Every bit of information taken from the CLI should be processed here. // @@ -305,7 +311,7 @@ public class MavenCli throw new ExitException( 0 ); } } - + private void commands( CliRequest cliRequest ) { if ( cliRequest.debug || cliRequest.commandLine.hasOption( CLIManager.SHOW_VERSION ) ) @@ -319,7 +325,7 @@ public class MavenCli } // - // TODO: move checksum policies to + // TODO: move checksum policies to // if ( MavenExecutionRequest.CHECKSUM_POLICY_WARN.equals( cliRequest.request.getGlobalChecksumPolicy() ) ) { @@ -376,11 +382,11 @@ public class MavenCli dispatcher = (DefaultSecDispatcher) container.lookup( SecDispatcher.class, "maven" ); } - + protected void customizeContainer( PlexusContainer container ) { } - + // // This should probably be a separate tool and not be baked into Maven. // @@ -393,7 +399,8 @@ public class MavenCli DefaultPlexusCipher cipher = new DefaultPlexusCipher(); - cliRequest.stdout.println( cipher.encryptAndDecorate( passwd, DefaultSecDispatcher.SYSTEM_PROPERTY_SEC_LOCATION ) ); + cliRequest.stdout.println( cipher.encryptAndDecorate( passwd, + DefaultSecDispatcher.SYSTEM_PROPERTY_SEC_LOCATION ) ); throw new ExitException( 0 ); } @@ -430,11 +437,11 @@ public class MavenCli throw new ExitException( 0 ); } } - + private int execute( CliRequest cliRequest ) { - MavenExecutionResult result = maven.execute( cliRequest.request ); - + MavenExecutionResult result = maven.execute( cliRequest.request ); + if ( result.hasExceptions() ) { ExceptionHandler handler = new DefaultExceptionHandler(); @@ -469,7 +476,8 @@ public class MavenCli if ( !references.isEmpty() ) { logger.error( "" ); - logger.error( "For more information about the errors and possible solutions" + ", please read the following articles:" ); + logger.error( "For more information about the errors and possible solutions" + + ", please read the following articles:" ); for ( Map.Entry<String, String> entry : references.entrySet() ) { @@ -501,7 +509,8 @@ public class MavenCli } } - private void logSummary( ExceptionSummary summary, Map<String, String> references, String indent, boolean showErrors ) + private void logSummary( ExceptionSummary summary, Map<String, String> references, String indent, + boolean showErrors ) { String referenceKey = ""; @@ -579,7 +588,8 @@ public class MavenCli if ( cliRequest.commandLine.hasOption( CLIManager.ALTERNATE_GLOBAL_SETTINGS ) ) { - globalSettingsFile = new File( cliRequest.commandLine.getOptionValue( CLIManager.ALTERNATE_GLOBAL_SETTINGS ) ); + globalSettingsFile = + new File( cliRequest.commandLine.getOptionValue( CLIManager.ALTERNATE_GLOBAL_SETTINGS ) ); globalSettingsFile = resolveFile( globalSettingsFile, cliRequest.workingDirectory ); if ( !globalSettingsFile.isFile() ) @@ -624,7 +634,7 @@ public class MavenCli private MavenExecutionRequest populateRequest( CliRequest cliRequest ) { - MavenExecutionRequest request = cliRequest.request; + MavenExecutionRequest request = cliRequest.request; CommandLine commandLine = cliRequest.commandLine; String workingDirectory = cliRequest.workingDirectory; boolean debug = cliRequest.debug; @@ -640,7 +650,7 @@ public class MavenCli + " is deprecated and will be removed in future Maven versions." ); } } - + // ---------------------------------------------------------------------- // Now that we have everything that we need we will fire up plexus and // bring the maven component to life for use. @@ -784,7 +794,8 @@ public class MavenCli // TODO: we need to do some more work here. Some plugins use sys out or log errors at info level. // Ideally, we could use Warn across the board loggingLevel = MavenExecutionRequest.LOGGING_LEVEL_ERROR; - // TODO:Additionally, we can't change the mojo level because the component key includes the version and it isn't known ahead of time. This seems worth changing. + // TODO:Additionally, we can't change the mojo level because the component key includes the version and + // it isn't known ahead of time. This seems worth changing. } else { @@ -850,15 +861,18 @@ public class MavenCli request.setSelectedProjects( Arrays.asList( projects ) ); } - if ( commandLine.hasOption( CLIManager.ALSO_MAKE ) && !commandLine.hasOption( CLIManager.ALSO_MAKE_DEPENDENTS ) ) + if ( commandLine.hasOption( CLIManager.ALSO_MAKE ) + && !commandLine.hasOption( CLIManager.ALSO_MAKE_DEPENDENTS ) ) { request.setMakeBehavior( MavenExecutionRequest.REACTOR_MAKE_UPSTREAM ); } - else if ( !commandLine.hasOption( CLIManager.ALSO_MAKE ) && commandLine.hasOption( CLIManager.ALSO_MAKE_DEPENDENTS ) ) + else if ( !commandLine.hasOption( CLIManager.ALSO_MAKE ) + && commandLine.hasOption( CLIManager.ALSO_MAKE_DEPENDENTS ) ) { request.setMakeBehavior( MavenExecutionRequest.REACTOR_MAKE_DOWNSTREAM ); } - else if ( commandLine.hasOption( CLIManager.ALSO_MAKE ) && commandLine.hasOption( CLIManager.ALSO_MAKE_DEPENDENTS ) ) + else if ( commandLine.hasOption( CLIManager.ALSO_MAKE ) + && commandLine.hasOption( CLIManager.ALSO_MAKE_DEPENDENTS ) ) { request.setMakeBehavior( MavenExecutionRequest.REACTOR_MAKE_BOTH ); } @@ -974,23 +988,23 @@ public class MavenCli System.setProperty( name, value ); } - + static class CliRequest { String[] args; CommandLine commandLine; PrintStream stdout; PrintStream stderr; - ClassWorld classWorld; + ClassWorld classWorld; String workingDirectory; boolean debug; boolean quiet; - boolean showErrors = true; + boolean showErrors = true; PrintStream fileStream; Properties userProperties = new Properties(); Properties systemProperties = new Properties(); MavenExecutionRequest request; - + CliRequest( String[] args, ClassWorld classWorld ) { this.args = args;
Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java?rev=958295&r1=958294&r2=958295&view=diff ============================================================================== --- maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java (original) +++ maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java Sat Jun 26 23:16:18 2010 @@ -185,17 +185,15 @@ public class DefaultModelBuilder return this; } - public DefaultModelBuilder setDependencyManagementImporter( - DependencyManagementImporter dependencyManagementImporter ) + public DefaultModelBuilder setDependencyManagementImporter( DependencyManagementImporter depMngmntImporter ) { - this.dependencyManagementImporter = dependencyManagementImporter; + this.dependencyManagementImporter = depMngmntImporter; return this; } - public DefaultModelBuilder setDependencyManagementInjector( - DependencyManagementInjector dependencyManagementInjector ) + public DefaultModelBuilder setDependencyManagementInjector( DependencyManagementInjector depMngmntInjector ) { - this.dependencyManagementInjector = dependencyManagementInjector; + this.dependencyManagementInjector = depMngmntInjector; return this; } @@ -331,7 +329,7 @@ public class DefaultModelBuilder problems.setSource( inputModel ); checkPluginVersions( lineage, request, problems ); - + assembleInheritance( lineage, request, problems ); Model resultModel = resultData.getModel(); @@ -500,7 +498,8 @@ public class DefaultModelBuilder } catch ( ModelParseException e ) { - problems.add( Severity.FATAL, "Non-parseable POM " + modelSource.getLocation() + ": " + e.getMessage(), null, e ); + problems.add( Severity.FATAL, "Non-parseable POM " + modelSource.getLocation() + ": " + e.getMessage(), + null, e ); throw new ModelBuildingException( problems.getRootModel(), problems.getRootModelId(), problems.getProblems() ); } @@ -647,7 +646,8 @@ public class DefaultModelBuilder return result; } - private ModelData readParent( Model childModel, ModelBuildingRequest request, DefaultModelProblemCollector problems ) + private ModelData readParent( Model childModel, ModelBuildingRequest request, + DefaultModelProblemCollector problems ) throws ModelBuildingException { ModelData parentData; Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingEventCatapult.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingEventCatapult.java?rev=958295&r1=958294&r2=958295&view=diff ============================================================================== --- maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingEventCatapult.java (original) +++ maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingEventCatapult.java Sat Jun 26 23:16:18 2010 @@ -22,7 +22,7 @@ package org.apache.maven.model.building; /** * Assists in firing events from a generic method by abstracting from the actual callback method to be called on the * listener. - * + * * @author Benjamin Bentmann */ interface ModelBuildingEventCatapult @@ -30,13 +30,13 @@ interface ModelBuildingEventCatapult /** * Notifies the specified listener of the given event. - * + * * @param listener The listener to notify, must not be {...@code null}. * @param event The event to fire, must not be {...@code null}. */ void fire( ModelBuildingListener listener, ModelBuildingEvent event ); - static final ModelBuildingEventCatapult BUILD_EXTENSIONS_ASSEMBLED = new ModelBuildingEventCatapult() + final ModelBuildingEventCatapult BUILD_EXTENSIONS_ASSEMBLED = new ModelBuildingEventCatapult() { public void fire( ModelBuildingListener listener, ModelBuildingEvent event ) { Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ModelInterpolator.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ModelInterpolator.java?rev=958295&r1=958294&r2=958295&view=diff ============================================================================== --- maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ModelInterpolator.java (original) +++ maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ModelInterpolator.java Sat Jun 26 23:16:18 2010 @@ -28,7 +28,7 @@ import java.io.File; /** * Replaces expressions of the form <tt>${token}</tt> with their effective values. Effective values are basically * calculated from the elements of the model itself and the execution properties from the building request. - * + * * @author jdcasey * <p/> * Created on Feb 2, 2005 @@ -40,7 +40,7 @@ public interface ModelInterpolator * Interpolates expressions in the specified model. Note that implementations are free to either interpolate the * provided model directly or to create a clone of the model and interpolate the clone. Callers should always use * the returned model and must not rely on the input model being updated. - * + * * @param model The model to interpolate, must not be {...@code null}. * @param projectDir The project directory, may be {...@code null} if the model does not belong to a local project but * to some artifact's metadata. @@ -48,6 +48,7 @@ public interface ModelInterpolator * @param problems The container used to collect problems that were encountered, must not be {...@code null}. * @return The interpolated model, never {...@code null}. */ - Model interpolateModel( Model model, File projectDir, ModelBuildingRequest request, ModelProblemCollector problems ); + Model interpolateModel( Model model, File projectDir, ModelBuildingRequest request, + ModelProblemCollector problems ); } Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/PathTranslatingPostProcessor.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/PathTranslatingPostProcessor.java?rev=958295&r1=958294&r2=958295&view=diff ============================================================================== --- maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/PathTranslatingPostProcessor.java (original) +++ maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/PathTranslatingPostProcessor.java Sat Jun 26 23:16:18 2010 @@ -28,7 +28,7 @@ import java.util.Collection; import java.util.List; /** - * + * * @version $Id$ */ class PathTranslatingPostProcessor @@ -40,7 +40,8 @@ class PathTranslatingPostProcessor private final PathTranslator pathTranslator; private final List<String> expressionPrefixes; - public PathTranslatingPostProcessor( List<String> expressionPrefixes, Collection<String> unprefixedPathKeys, File projectDir, PathTranslator pathTranslator ) + public PathTranslatingPostProcessor( List<String> expressionPrefixes, Collection<String> unprefixedPathKeys, + File projectDir, PathTranslator pathTranslator ) { this.expressionPrefixes = expressionPrefixes; this.unprefixedPathKeys = unprefixedPathKeys; Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java?rev=958295&r1=958294&r2=958295&view=diff ============================================================================== --- maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java (original) +++ maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java Sat Jun 26 23:16:18 2010 @@ -35,7 +35,11 @@ import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.security.AccessController; import java.security.PrivilegedAction; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @Component( role = ModelInterpolator.class ) @@ -44,9 +48,9 @@ public class StringSearchModelInterpolat { private static final Map<Class<?>, Field[]> fieldsByClass = - new ConcurrentHashMap<Class<?>, Field[]>(80, 0.75f, 2); // Empirical data from 3.x, actual =40 + new ConcurrentHashMap<Class<?>, Field[]>( 80, 0.75f, 2 ); // Empirical data from 3.x, actual =40 private static final Map<Class<?>, Boolean> fieldIsPrimitiveByClass = - new ConcurrentHashMap<Class<?>, Boolean>(62, 0.75f, 2); // Empirical data from 3.x, actual 31 + new ConcurrentHashMap<Class<?>, Boolean>( 62, 0.75f, 2 ); // Empirical data from 3.x, actual 31 public Model interpolateModel( Model model, File projectDir, ModelBuildingRequest config, ModelProblemCollector problems ) @@ -95,7 +99,8 @@ public class StringSearchModelInterpolat public InterpolateObjectAction( Object target, List<? extends ValueSource> valueSources, List<? extends InterpolationPostProcessor> postProcessors, - StringSearchModelInterpolator modelInterpolator, ModelProblemCollector problems) + StringSearchModelInterpolator modelInterpolator, + ModelProblemCollector problems ) { this.valueSources = valueSources; this.postProcessors = postProcessors; @@ -120,7 +125,7 @@ public class StringSearchModelInterpolat return null; } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) private void traverseObjectWithParents( Class<?> cls, Object target ) { if ( cls == null ) @@ -128,20 +133,19 @@ public class StringSearchModelInterpolat return; } - if ( cls.isArray() ) { evaluateArray( target ); } else if ( isQualifiedForInterpolation( cls ) ) { - Field[] fields = getFields(cls); - for (Field currentField : fields) + for ( Field currentField : getFields( cls ) ) { Class<?> type = currentField.getType(); if ( isQualifiedForInterpolation( currentField, type ) ) { - synchronized ( currentField){ + synchronized ( currentField ) + { boolean isAccessible = currentField.isAccessible(); currentField.setAccessible( true ); try @@ -282,13 +286,13 @@ public class StringSearchModelInterpolat } catch ( IllegalArgumentException e ) { - problems.add( Severity.ERROR, "Failed to interpolate field3: " + currentField + - " on class: " + cls.getName(), null, e ); + problems.add( Severity.ERROR, "Failed to interpolate field3: " + currentField + + " on class: " + cls.getName(), null, e ); } catch ( IllegalAccessException e ) { - problems.add( Severity.ERROR, "Failed to interpolate field4: " + currentField + - " on class: " + cls.getName(), null, e ); + problems.add( Severity.ERROR, "Failed to interpolate field4: " + currentField + + " on class: " + cls.getName(), null, e ); } finally { @@ -302,8 +306,9 @@ public class StringSearchModelInterpolat } } - private Field[] getFields(Class<?> cls) { - Field[] fields = fieldsByClass.get(cls); + private Field[] getFields( Class<?> cls ) + { + Field[] fields = fieldsByClass.get( cls ); if ( fields == null ) { fields = cls.getDeclaredFields(); @@ -319,7 +324,7 @@ public class StringSearchModelInterpolat private boolean isQualifiedForInterpolation( Field field, Class<?> fieldType ) { - Boolean primitive = fieldIsPrimitiveByClass.get(fieldType); + Boolean primitive = fieldIsPrimitiveByClass.get( fieldType ); if ( primitive == null ) { primitive = fieldType.isPrimitive(); @@ -331,8 +336,7 @@ public class StringSearchModelInterpolat return false; } - return !"parent".equals(field.getName()); - + return !"parent".equals( field.getName() ); } private void evaluateArray( Object target ) Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java?rev=958295&r1=958294&r2=958295&view=diff ============================================================================== --- maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java (original) +++ maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java Sat Jun 26 23:16:18 2010 @@ -166,31 +166,36 @@ public class MavenModelMerger } @Override - protected void mergeModel_ModelVersion( Model target, Model source, boolean sourceDominant, Map<Object, Object> context ) + protected void mergeModel_ModelVersion( Model target, Model source, boolean sourceDominant, + Map<Object, Object> context ) { // neither inherited nor injected } @Override - protected void mergeModel_ArtifactId( Model target, Model source, boolean sourceDominant, Map<Object, Object> context ) + protected void mergeModel_ArtifactId( Model target, Model source, boolean sourceDominant, + Map<Object, Object> context ) { // neither inherited nor injected } @Override - protected void mergeModel_Profiles( Model target, Model source, boolean sourceDominant, Map<Object, Object> context ) + protected void mergeModel_Profiles( Model target, Model source, boolean sourceDominant, + Map<Object, Object> context ) { // neither inherited nor injected } @Override - protected void mergeModel_Prerequisites( Model target, Model source, boolean sourceDominant, Map<Object, Object> context ) + protected void mergeModel_Prerequisites( Model target, Model source, boolean sourceDominant, + Map<Object, Object> context ) { // neither inherited nor injected } @Override - protected void mergeModel_Licenses( Model target, Model source, boolean sourceDominant, Map<Object, Object> context ) + protected void mergeModel_Licenses( Model target, Model source, boolean sourceDominant, + Map<Object, Object> context ) { if ( target.getLicenses().isEmpty() ) { @@ -370,7 +375,8 @@ public class MavenModelMerger @Override protected void mergeDistributionManagement_SnapshotRepository( DistributionManagement target, DistributionManagement source, - boolean sourceDominant, Map<Object, Object> context ) + boolean sourceDominant, + Map<Object, Object> context ) { DeploymentRepository src = source.getSnapshotRepository(); if ( src != null ) @@ -492,7 +498,8 @@ public class MavenModelMerger for ( PluginExecution element : src ) { - if ( sourceDominant || ( element.getInherited() != null ? element.isInherited() : source.isInherited() ) ) + if ( sourceDominant + || ( element.getInherited() != null ? element.isInherited() : source.isInherited() ) ) { Object key = getPluginExecutionKey( element ); merged.put( key, element ); Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java?rev=958295&r1=958294&r2=958295&view=diff ============================================================================== --- maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java (original) +++ maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java Sat Jun 26 23:16:18 2010 @@ -20,14 +20,13 @@ package org.apache.maven.model.resolutio */ import org.apache.maven.model.Repository; -import org.apache.maven.model.building.ModelBuilder; import org.apache.maven.model.building.ModelSource; /** * Resolves a POM from its coordinates. During the build process, the {...@link ModelBuilder} will add any relevant * repositories to the model resolver. In other words, the model resolver is stateful and should not be reused across * multiple model building requests. - * + * * @author Benjamin Bentmann */ public interface ModelResolver @@ -35,7 +34,7 @@ public interface ModelResolver /** * Tries to resolve the POM for the specified coordinates. - * + * * @param groupId The group identifier of the POM, must not be {...@code null}. * @param artifactId The artifact identifier of the POM, must not be {...@code null}. * @param version The version of the POM, must not be {...@code null}. @@ -49,7 +48,7 @@ public interface ModelResolver * Adds a repository to use for subsequent resolution requests. The order in which repositories are added matters, * repositories that were added first should also be searched first. When multiple repositories with the same * identifier are added, only the first repository being added will be used. - * + * * @param repository The repository to add to the internal search chain, must not be {...@code null}. * @throws InvalidRepositoryException If the repository could not be added (e.g. due to invalid URL or layout). */ @@ -60,7 +59,7 @@ public interface ModelResolver * Clones this resolver for usage in a forked resolution process. In general, implementors need not provide a deep * clone. The only requirement is that invocations of {...@link #addRepository(Repository)} on the clone do not affect * the state of the original resolver and vice versa. - * + * * @return The cloned resolver, never {...@code null}. */ ModelResolver newCopy(); Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java?rev=958295&r1=958294&r2=958295&view=diff ============================================================================== --- maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java (original) +++ maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java Sat Jun 26 23:16:18 2010 @@ -31,7 +31,7 @@ import org.codehaus.plexus.component.ann /** * Provides the super POM that all models implicitly inherit from. - * + * * @author Benjamin Bentmann */ @Component( role = SuperPomProvider.class ) @@ -69,7 +69,7 @@ public class DefaultSuperPomProvider try { - Map<String,String> options = new HashMap<String,String>(); + Map<String, String> options = new HashMap<String, String>(); options.put( "xml:4.0.0", "xml:4.0.0" ); superModel = modelProcessor.read( is, options ); } Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java?rev=958295&r1=958294&r2=958295&view=diff ============================================================================== --- maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java (original) +++ maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java Sat Jun 26 23:16:18 2010 @@ -54,7 +54,7 @@ import org.codehaus.plexus.util.StringUt * @author <a href="mailto:[email protected]";>Trygve Laugstøl</a> * @version $Id$ */ -...@component(role = ModelValidator.class ) +...@component( role = ModelValidator.class ) public class DefaultModelValidator implements ModelValidator { @@ -99,7 +99,8 @@ public class DefaultModelValidator validateRepositories( problems, model.getRepositories(), "repositories.repository", request ); - validateRepositories( problems, model.getPluginRepositories(), "pluginRepositories.pluginRepository", request ); + validateRepositories( problems, model.getPluginRepositories(), "pluginRepositories.pluginRepository", + request ); Build build = model.getBuild(); if ( build != null ) @@ -109,7 +110,8 @@ public class DefaultModelValidator PluginManagement mngt = build.getPluginManagement(); if ( mngt != null ) { - validateRawPlugins( problems, mngt.getPlugins(), "build.pluginManagement.plugins.plugin", request ); + validateRawPlugins( problems, mngt.getPlugins(), "build.pluginManagement.plugins.plugin", + request ); } } @@ -134,7 +136,8 @@ public class DefaultModelValidator + ".dependencyManagement.dependencies.dependency", request ); } - validateRepositories( problems, profile.getRepositories(), prefix + ".repositories.repository", request ); + validateRepositories( problems, profile.getRepositories(), prefix + ".repositories.repository", + request ); validateRepositories( problems, profile.getPluginRepositories(), prefix + ".pluginRepositories.pluginRepository", request ); @@ -257,7 +260,8 @@ public class DefaultModelValidator validateStringNotEmpty( "build.plugins.plugin.artifactId", problems, Severity.ERROR, p.getArtifactId(), p ); - validateStringNotEmpty( "build.plugins.plugin.groupId", problems, Severity.ERROR, p.getGroupId(), p ); + validateStringNotEmpty( "build.plugins.plugin.groupId", problems, Severity.ERROR, p.getGroupId(), + p ); validatePluginVersion( "build.plugins.plugin.version", problems, p.getVersion(), p.getKey(), p, request ); @@ -394,8 +398,8 @@ public class DefaultModelValidator validateVersion( prefix + "version", problems, errOn30, d.getVersion(), d.getManagementKey(), d ); /* - * TODO: Extensions like Flex Mojos use custom scopes like "merged", "internal", "external", etc. In - * order to don't break backward-compat with those, only warn but don't error out. + * TODO: Extensions like Flex Mojos use custom scopes like "merged", "internal", "external", etc. + * In order to don't break backward-compat with those, only warn but don't error out. */ validateEnum( prefix + "scope", problems, Severity.WARNING, d.getScope(), d.getManagementKey(), d, "provided", "compile", "runtime", "test", "system" ); @@ -448,7 +452,8 @@ public class DefaultModelValidator if ( StringUtils.isEmpty( systemPath ) ) { - addViolation( problems, Severity.ERROR, prefix + "systemPath", d.getManagementKey(), "is missing.", d ); + addViolation( problems, Severity.ERROR, prefix + "systemPath", d.getManagementKey(), "is missing.", + d ); } else { @@ -529,13 +534,15 @@ public class DefaultModelValidator } } - private void validateResources( ModelProblemCollector problems, List<Resource> resources, String prefix, ModelBuildingRequest request ) + private void validateResources( ModelProblemCollector problems, List<Resource> resources, String prefix, + ModelBuildingRequest request ) { Severity errOn30 = getSeverity( request, ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_0 ); for ( Resource resource : resources ) { - validateStringNotEmpty( prefix + ".directory", problems, Severity.ERROR, resource.getDirectory(), resource ); + validateStringNotEmpty( prefix + ".directory", problems, Severity.ERROR, resource.getDirectory(), + resource ); validateBoolean( prefix + ".filtering", problems, errOn30, resource.getFiltering(), resource.getDirectory(), resource ); @@ -546,7 +553,8 @@ public class DefaultModelValidator // Field validation // ---------------------------------------------------------------------- - private boolean validateId( String fieldName, ModelProblemCollector problems, String id, InputLocationTracker tracker ) + private boolean validateId( String fieldName, ModelProblemCollector problems, String id, + InputLocationTracker tracker ) { return validateId( fieldName, problems, id, null, tracker ); } @@ -578,7 +586,8 @@ public class DefaultModelValidator return true; } - addViolation( problems, severity, fieldName, null, "contains an expression but should be a constant.", tracker ); + addViolation( problems, severity, fieldName, null, "contains an expression but should be a constant.", + tracker ); return false; } @@ -640,8 +649,8 @@ public class DefaultModelValidator return false; } - private boolean validateBoolean( String fieldName, ModelProblemCollector problems, Severity severity, String string, - String sourceHint, InputLocationTracker tracker ) + private boolean validateBoolean( String fieldName, ModelProblemCollector problems, Severity severity, + String string, String sourceHint, InputLocationTracker tracker ) { if ( string == null || string.length() <= 0 ) { @@ -680,8 +689,8 @@ public class DefaultModelValidator return false; } - private boolean validateVersion( String fieldName, ModelProblemCollector problems, Severity severity, String string, - String sourceHint, InputLocationTracker tracker ) + private boolean validateVersion( String fieldName, ModelProblemCollector problems, Severity severity, + String string, String sourceHint, InputLocationTracker tracker ) { if ( string == null || string.length() <= 0 ) { @@ -700,7 +709,8 @@ public class DefaultModelValidator } private boolean validatePluginVersion( String fieldName, ModelProblemCollector problems, String string, - String sourceHint, InputLocationTracker tracker, ModelBuildingRequest request ) + String sourceHint, InputLocationTracker tracker, + ModelBuildingRequest request ) { Severity errOn30 = getSeverity( request, ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_0 ); @@ -733,7 +743,7 @@ public class DefaultModelValidator buffer.append( " for " ).append( sourceHint ); } - buffer.append(' ').append( message ); + buffer.append( ' ' ).append( message ); problems.add( severity, buffer.toString(), getLocation( fieldName, tracker ), null ); } Modified: maven/maven-3/trunk/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java?rev=958295&r1=958294&r2=958295&view=diff ============================================================================== --- maven/maven-3/trunk/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java (original) +++ maven/maven-3/trunk/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java Sat Jun 26 23:16:18 2010 @@ -167,7 +167,8 @@ public class ModelMerger } } - protected void mergeModel_GroupId( Model target, Model source, boolean sourceDominant, Map<Object, Object> context ) + protected void mergeModel_GroupId( Model target, Model source, boolean sourceDominant, + Map<Object, Object> context ) { String src = source.getGroupId(); if ( src != null ) @@ -194,7 +195,8 @@ public class ModelMerger } } - protected void mergeModel_Version( Model target, Model source, boolean sourceDominant, Map<Object, Object> context ) + protected void mergeModel_Version( Model target, Model source, boolean sourceDominant, + Map<Object, Object> context ) { String src = source.getVersion(); if ( src != null ) @@ -207,7 +209,8 @@ public class ModelMerger } } - protected void mergeModel_Packaging( Model target, Model source, boolean sourceDominant, Map<Object, Object> context ) + protected void mergeModel_Packaging( Model target, Model source, boolean sourceDominant, + Map<Object, Object> context ) { String src = source.getPackaging(); if ( src != null ) @@ -290,7 +293,8 @@ public class ModelMerger } } - protected void mergeModel_Licenses( Model target, Model source, boolean sourceDominant, Map<Object, Object> context ) + protected void mergeModel_Licenses( Model target, Model source, boolean sourceDominant, + Map<Object, Object> context ) { List<License> src = source.getLicenses(); if ( !src.isEmpty() ) @@ -479,7 +483,8 @@ public class ModelMerger } } - protected void mergeModel_Profiles( Model target, Model source, boolean sourceDominant, Map<Object, Object> context ) + protected void mergeModel_Profiles( Model target, Model source, boolean sourceDominant, + Map<Object, Object> context ) { List<Profile> src = source.getProfiles(); if ( !src.isEmpty() ) @@ -713,7 +718,8 @@ public class ModelMerger protected void mergeDistributionManagement_SnapshotRepository( DistributionManagement target, DistributionManagement source, - boolean sourceDominant, Map<Object, Object> context ) + boolean sourceDominant, + Map<Object, Object> context ) { DeploymentRepository src = source.getSnapshotRepository(); if ( src != null ) @@ -1580,7 +1586,8 @@ public class ModelMerger } } - protected void mergeLicense_Url( License target, License source, boolean sourceDominant, Map<Object, Object> context ) + protected void mergeLicense_Url( License target, License source, boolean sourceDominant, + Map<Object, Object> context ) { String src = source.getUrl(); if ( src != null ) @@ -2026,7 +2033,8 @@ public class ModelMerger } } - protected void mergeNotifier( Notifier target, Notifier source, boolean sourceDominant, Map<Object, Object> context ) + protected void mergeNotifier( Notifier target, Notifier source, boolean sourceDominant, + Map<Object, Object> context ) { mergeNotifier_Type( target, source, sourceDominant, context ); mergeNotifier_Address( target, source, sourceDominant, context ); @@ -2699,7 +2707,8 @@ public class ModelMerger } } - protected void mergeResource( Resource target, Resource source, boolean sourceDominant, Map<Object, Object> context ) + protected void mergeResource( Resource target, Resource source, boolean sourceDominant, + Map<Object, Object> context ) { mergeFileSet( target, source, sourceDominant, context ); mergeResource_TargetPath( target, source, sourceDominant, context ); Modified: maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java?rev=958295&r1=958294&r2=958295&view=diff ============================================================================== --- maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java (original) +++ maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java Sat Jun 26 23:16:18 2010 @@ -96,7 +96,8 @@ import org.apache.maven.plugin.logging.S * The execution of either will not affect the current project, but instead make available the * <code>${executedProject}</code> expression if required. An alternate lifecycle can also be provided: * for more information see the documentation on the - * <a href="http://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html"; target="_blank">build lifecycle</a>. + * <a href="http://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html"; + * target="_blank">build lifecycle</a>. * </td> * </tr> * <tr> @@ -158,15 +159,15 @@ public abstract class AbstractMojo } /** - * Returns the logger that has been injected into this mojo. If no logger has been setup yet, a <code>SystemStreamLog</code> - * logger will be created and returned. + * Returns the logger that has been injected into this mojo. If no logger has been setup yet, a + * <code>SystemStreamLog</code> logger will be created and returned. * <br/><br/> * <strong>Note:</strong> * The logger returned by this method must not be cached in an instance field during the construction of the mojo. * This would cause the mojo to use a wrongly configured default logger when being run by Maven. The proper logger * gets injected by the Plexus container <em>after</em> the mojo has been constructed. Therefore, simply call this * method directly whenever you need the logger, it is fast enough and needs no caching. - * + * * @see org.apache.maven.plugin.Mojo#getLog() */ public Log getLog() Modified: maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/Mojo.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/Mojo.java?rev=958295&r1=958294&r2=958295&view=diff ============================================================================== --- maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/Mojo.java (original) +++ maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/Mojo.java Sat Jun 26 23:16:18 2010 @@ -28,8 +28,8 @@ import org.apache.maven.plugin.logging.L * It features an <code>execute()</code> method, which triggers the Mojo's build-process behavior, and can throw * a MojoExecutionException or MojoFailureException if error conditions occur. * <br/> - * Also included is the <code>setLog(...)</code> method, which simply allows Maven to inject a logging mechanism which will - * allow the Mojo to communicate to the outside world through standard Maven channels. + * Also included is the <code>setLog(...)</code> method, which simply allows Maven to inject a logging mechanism which + * will allow the Mojo to communicate to the outside world through standard Maven channels. * * @author Jason van Zyl */ Modified: maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/DuplicateMojoDescriptorException.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/DuplicateMojoDescriptorException.java?rev=958295&r1=958294&r2=958295&view=diff ============================================================================== --- maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/DuplicateMojoDescriptorException.java (original) +++ maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/DuplicateMojoDescriptorException.java Sat Jun 26 23:16:18 2010 @@ -23,9 +23,12 @@ public class DuplicateMojoDescriptorExce extends InvalidPluginDescriptorException { - public DuplicateMojoDescriptorException( String goalPrefix, String goal, String existingImplementation, String newImplementation ) + public DuplicateMojoDescriptorException( String goalPrefix, String goal, String existingImplementation, + String newImplementation ) { - super( "Goal: " + goal + " already exists in the plugin descriptor for prefix: " + goalPrefix + "\nExisting implementation is: " + existingImplementation + "\nConflicting implementation is: " + newImplementation ); + super( "Goal: " + goal + " already exists in the plugin descriptor for prefix: " + goalPrefix + + "\nExisting implementation is: " + existingImplementation + + "\nConflicting implementation is: " + newImplementation ); } } Modified: maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java?rev=958295&r1=958294&r2=958295&view=diff ============================================================================== --- maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java (original) +++ maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java Sat Jun 26 23:16:18 2010 @@ -33,7 +33,8 @@ import org.codehaus.plexus.configuration * The bean containing the Mojo descriptor. * <br/> * For more information about the usage tag, have a look to: - * <a href="http://maven.apache.org/developers/mojo-api-specification.html";>http://maven.apache.org/developers/mojo-api-specification.html</a> + * <a href="http://maven.apache.org/developers/mojo-api-specification.html";> + * http://maven.apache.org/developers/mojo-api-specification.html</a> * * @todo is there a need for the delegation of MavenMojoDescriptor to this? * Why not just extend ComponentDescriptor here? @@ -278,7 +279,8 @@ public class MojoDescriptor // ---------------------------------------------------------------------- /** - * @param requiresProject <code>true</code> if the Mojo needs a Maven project to be executed, <code>false</code> otherwise. + * @param requiresProject <code>true</code> if the Mojo needs a Maven project to be executed, <code>false</code> + * otherwise. */ public void setProjectRequired( boolean requiresProject ) { @@ -577,7 +579,8 @@ public class MojoDescriptor } /** - * @param aggregator <code>true</code> if the Mojo uses the Maven project and its child modules, <code>false</code> otherwise. + * @param aggregator <code>true</code> if the Mojo uses the Maven project and its child modules, + * <code>false</code> otherwise. */ public void setAggregator( boolean aggregator ) { @@ -585,7 +588,8 @@ public class MojoDescriptor } /** - * @return <code>true</code> if the Mojo uses the Maven project and its child modules, <code>false</code> otherwise. + * @return <code>true</code> if the Mojo uses the Maven project and its child modules, + * <code>false</code> otherwise. */ public boolean isAggregator() { @@ -601,7 +605,8 @@ public class MojoDescriptor } /** - * @param directInvocationOnly <code>true</code> if the Mojo could not be invoke directly, <code>false</code> otherwise. + * @param directInvocationOnly <code>true</code> if the Mojo could not be invoke directly, + * <code>false</code> otherwise. */ public void setDirectInvocationOnly( boolean directInvocationOnly ) { Modified: maven/maven-3/trunk/maven-settings/src/main/java/org/apache/maven/settings/RuntimeInfo.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-settings/src/main/java/org/apache/maven/settings/RuntimeInfo.java?rev=958295&r1=958294&r2=958295&view=diff ============================================================================== --- maven/maven-3/trunk/maven-settings/src/main/java/org/apache/maven/settings/RuntimeInfo.java (original) +++ maven/maven-3/trunk/maven-settings/src/main/java/org/apache/maven/settings/RuntimeInfo.java Sat Jun 26 23:16:18 2010 @@ -1,7 +1,5 @@ package org.apache.maven.settings; -import java.io.File; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -21,6 +19,7 @@ import java.io.File; * under the License. */ +import java.io.File; /** * To handle runtime informations like local repository or profiles. @@ -35,14 +34,14 @@ public class RuntimeInfo public static final File userMavenConfigurationHome = new File( userHome, ".m2" ); public static final File DEFAULT_USER_SETTINGS_FILE = new File( userMavenConfigurationHome, "settings.xml" ); - + private File settings; public RuntimeInfo() { this.settings = DEFAULT_USER_SETTINGS_FILE; } - + public RuntimeInfo( File settings ) { this.settings = settings;
