You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2010/06/27 01:16:26 UTC
svn commit: r958295 [8/9] - in /maven/maven-3/trunk:
maven-artifact/src/main/java/org/apache/maven/artifact/
maven-artifact/src/main/java/org/apache/maven/artifact/repository/
maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/
ma...
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java Sat Jun 26 23:16:18 2010
@@ -1,18 +1,22 @@
package org.apache.maven.project;
/*
- * 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;
@@ -166,7 +170,7 @@ public class MavenProject
private ProjectBuildingRequest projectBuilderConfiguration;
private RepositorySystem repositorySystem;
-
+
private File parentFile;
private Map<String, Object> context;
@@ -201,10 +205,10 @@ public class MavenProject
{
deepCopy( project );
}
-
+
@Deprecated
public MavenProject( Model model, RepositorySystem repositorySystem )
- {
+ {
this.repositorySystem = repositorySystem;
setModel( model );
}
@@ -221,13 +225,14 @@ public class MavenProject
/**
* Constructor
- *
+ *
* @param repositorySystem - may not be null
* @param mavenProjectBuilder
* @param projectBuilderConfiguration
* @throws InvalidRepositoryException
*/
- MavenProject( RepositorySystem repositorySystem, ProjectBuilder mavenProjectBuilder, ProjectBuildingRequest projectBuilderConfiguration )
+ MavenProject( RepositorySystem repositorySystem, ProjectBuilder mavenProjectBuilder,
+ ProjectBuildingRequest projectBuilderConfiguration )
{
if ( repositorySystem == null )
{
@@ -364,7 +369,7 @@ public class MavenProject
{
this.parent = parent;
}
-
+
public boolean hasParent()
{
return getParent() != null;
@@ -485,11 +490,12 @@ public class MavenProject
list.add( getBuild().getOutputDirectory() );
for ( Artifact a : getArtifacts() )
- {
+ {
if ( a.getArtifactHandler().isAddedToClasspath() )
{
// TODO: let the scope handler deal with this
- if ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) || Artifact.SCOPE_PROVIDED.equals( a.getScope() ) || Artifact.SCOPE_SYSTEM.equals( a.getScope() ) )
+ if ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) || Artifact.SCOPE_PROVIDED.equals( a.getScope() )
+ || Artifact.SCOPE_SYSTEM.equals( a.getScope() ) )
{
addArtifactPath( a, list );
}
@@ -510,7 +516,8 @@ public class MavenProject
if ( a.getArtifactHandler().isAddedToClasspath() )
{
// TODO: let the scope handler deal with this
- if ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) || Artifact.SCOPE_PROVIDED.equals( a.getScope() ) || Artifact.SCOPE_SYSTEM.equals( a.getScope() ) )
+ if ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) || Artifact.SCOPE_PROVIDED.equals( a.getScope() )
+ || Artifact.SCOPE_SYSTEM.equals( a.getScope() ) )
{
list.add( a );
}
@@ -534,7 +541,8 @@ public class MavenProject
for ( Artifact a : getArtifacts() )
{
// TODO: let the scope handler deal with this
- if ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) || Artifact.SCOPE_PROVIDED.equals( a.getScope() ) || Artifact.SCOPE_SYSTEM.equals( a.getScope() ) )
+ if ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) || Artifact.SCOPE_PROVIDED.equals( a.getScope() )
+ || Artifact.SCOPE_SYSTEM.equals( a.getScope() ) )
{
Dependency dependency = new Dependency();
@@ -561,11 +569,11 @@ public class MavenProject
list.add( getBuild().getTestOutputDirectory() );
list.add( getBuild().getOutputDirectory() );
-
+
for ( Artifact a : getArtifacts() )
- {
+ {
if ( a.getArtifactHandler().isAddedToClasspath() )
- {
+ {
addArtifactPath( a, list );
}
}
@@ -1053,7 +1061,7 @@ public class MavenProject
* All dependencies that this project has, including transitive ones. Contents are lazily
* populated, so depending on what phases have run dependencies in some scopes won't be
* included. eg. if only compile phase has run, dependencies with scope test won't be included.
- *
+ *
* @return {@link Set} < {@link Artifact} >
* @see #getDependencyArtifacts() to get only direct dependencies
*/
@@ -1227,7 +1235,8 @@ public class MavenProject
version = ext.getVersion();
}
- Artifact artifact = repositorySystem.createArtifact( ext.getGroupId(), ext.getArtifactId(), version, null, "jar" );
+ Artifact artifact =
+ repositorySystem.createArtifact( ext.getGroupId(), ext.getArtifactId(), version, null, "jar" );
if ( artifact != null )
{
@@ -1361,7 +1370,8 @@ public class MavenProject
public ArtifactRepository getDistributionManagementArtifactRepository()
{
- return getArtifact().isSnapshot() && ( getSnapshotArtifactRepository() != null ) ? getSnapshotArtifactRepository() : getReleaseArtifactRepository();
+ return getArtifact().isSnapshot() && ( getSnapshotArtifactRepository() != null ) ? getSnapshotArtifactRepository()
+ : getReleaseArtifactRepository();
}
public List<Repository> getPluginRepositories()
@@ -1397,7 +1407,7 @@ public class MavenProject
* settings.xml}. The profile identifiers are grouped by the identifier of their source, e.g. {@code
* <groupId>:<artifactId>:<version>} for a POM profile or {@code external} for profiles from the {@code
* settings.xml}.
- *
+ *
* @return The identifiers of all injected profiles, indexed by the source from which the profiles originated, never
* {@code null}.
*/
@@ -1537,7 +1547,7 @@ public class MavenProject
/**
* Direct dependencies that this project has.
- *
+ *
* @return {@link Set} < {@link Artifact} >
* @see #getArtifacts() to get all transitive dependencies
*/
@@ -1589,7 +1599,8 @@ public class MavenProject
List<Dependency> deps;
DependencyManagement dependencyManagement = getDependencyManagement();
- if ( ( dependencyManagement != null ) && ( ( deps = dependencyManagement.getDependencies() ) != null ) && ( deps.size() > 0 ) )
+ if ( ( dependencyManagement != null ) && ( ( deps = dependencyManagement.getDependencies() ) != null )
+ && ( deps.size() > 0 ) )
{
map = new HashMap<String, Artifact>();
for ( Iterator<Dependency> i = dependencyManagement.getDependencies().iterator(); i.hasNext(); )
@@ -1664,7 +1675,8 @@ public class MavenProject
public void addProjectReference( MavenProject project )
{
- projectReferences.put( getProjectReferenceId( project.getGroupId(), project.getArtifactId(), project.getVersion() ), project );
+ projectReferences.put( getProjectReferenceId( project.getGroupId(), project.getArtifactId(),
+ project.getVersion() ), project );
}
/**
@@ -1822,7 +1834,7 @@ public class MavenProject
{
}
}
-
+
return releaseArtifactRepository;
}
@@ -1842,7 +1854,7 @@ public class MavenProject
{
}
}
-
+
return snapshotArtifactRepository;
}
@@ -1970,9 +1982,9 @@ public class MavenProject
* Sets the value of the context value of this project identified
* by the given key. If the supplied value is <code>null</code>,
* the context value is removed from this project.
- *
+ *
* Context values are intended to allow core extensions to associate
- * derived state with project instances.
+ * derived state with project instances.
*/
public void setContextValue( String key, Object value )
{
@@ -1991,8 +2003,8 @@ public class MavenProject
}
/**
- * Returns context value of this project associated with the given key
- * or null if this project has no such value.
+ * Returns context value of this project associated with the given key
+ * or null if this project has no such value.
*/
public Object getContextValue( String key )
{
@@ -2007,7 +2019,7 @@ public class MavenProject
* Sets the project's class realm. <strong>Warning:</strong> This is an internal utility method that is only public
* for technical reasons, it is not part of the public API. In particular, this method can be changed or deleted
* without prior notice and must not be used by plugins.
- *
+ *
* @param classRealm The class realm hosting the build extensions of this project, may be {@code null}.
*/
public void setClassRealm( ClassRealm classRealm )
@@ -2020,7 +2032,7 @@ public class MavenProject
* <strong>Warning:</strong> This is an internal utility method that is only public for technical reasons, it is not
* part of the public API. In particular, this method can be changed or deleted without prior notice and must not be
* used by plugins.
- *
+ *
* @return The project's class realm or {@code null}.
*/
public ClassRealm getClassRealm()
@@ -2032,7 +2044,7 @@ public class MavenProject
* Sets the artifact filter used to exclude shared extension artifacts from plugin realms. <strong>Warning:</strong>
* This is an internal utility method that is only public for technical reasons, it is not part of the public API.
* In particular, this method can be changed or deleted without prior notice and must not be used by plugins.
- *
+ *
* @param extensionArtifactFilter The artifact filter to apply to plugins, may be {@code null}.
*/
public void setExtensionArtifactFilter( ArtifactFilter extensionArtifactFilter )
@@ -2044,7 +2056,7 @@ public class MavenProject
* Gets the artifact filter used to exclude shared extension artifacts from plugin realms. <strong>Warning:</strong>
* This is an internal utility method that is only public for technical reasons, it is not part of the public API.
* In particular, this method can be changed or deleted without prior notice and must not be used by plugins.
- *
+ *
* @return The artifact filter or {@code null}.
*/
public ArtifactFilter getExtensionArtifactFilter()
@@ -2057,7 +2069,7 @@ public class MavenProject
* <strong>Warning:</strong> This is an internal utility method that is only public for technical reasons, it is not
* part of the public API. In particular, this method can be changed or deleted without prior notice and must not be
* used by plugins.
- *
+ *
* @param artifacts The set of artifacts, may be {@code null}.
*/
public void setResolvedArtifacts( Set<Artifact> artifacts )
@@ -2072,7 +2084,7 @@ public class MavenProject
* <strong>Warning:</strong> This is an internal utility method that is only public for technical reasons, it is not
* part of the public API. In particular, this method can be changed or deleted without prior notice and must not be
* used by plugins.
- *
+ *
* @param artifactFilter The artifact filter, may be {@code null} to exclude all artifacts.
*/
public void setArtifactFilter( ArtifactFilter artifactFilter )
@@ -2098,7 +2110,7 @@ public class MavenProject
* <strong>Warning:</strong> This is an internal utility method that is only public for technical reasons, it is not
* part of the public API. In particular, this method can be changed or deleted without prior notice and must not be
* used by plugins.
- *
+ *
* @param lifecyclePhase The lifecycle phase to add, must not be {@code null}.
*/
public void addLifecyclePhase( String lifecyclePhase )
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java Sat Jun 26 23:16:18 2010
@@ -1,18 +1,22 @@
package org.apache.maven.project;
/*
- * 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;
@@ -29,7 +33,7 @@ public interface ProjectBuilder
/**
* Builds a project descriptor from the specified POM file.
- *
+ *
* @param projectFile The POM file to build the project from, must not be {@code null}.
* @param request The project building request that holds further parameters, must not be {@code null}.
* @return The result of the project building, never {@code null}.
@@ -40,7 +44,7 @@ public interface ProjectBuilder
/**
* Builds a project descriptor for the specified artifact.
- *
+ *
* @param projectArtifact The POM artifact to build the project from, must not be {@code null}.
* @param request The project building request that holds further parameters, must not be {@code null}.
* @return The result of the project building, never {@code null}.
@@ -51,7 +55,7 @@ public interface ProjectBuilder
/**
* Builds a project descriptor for the specified artifact.
- *
+ *
* @param projectArtifact The POM artifact to build the project from, must not be {@code null}.
* @param allowStubModel A flag controlling the case of a missing POM artifact. If {@code true} and the specified
* POM artifact does not exist, a simple stub model will be returned. If {@code false}, an exception will
@@ -65,7 +69,7 @@ public interface ProjectBuilder
/**
* Builds a project descriptor for the specified model source.
- *
+ *
* @param modelSource The source of the model to built the project descriptor from, must not be {@code null}.
* @param request The project building request that holds further parameters, must not be {@code null}.
* @return The result of the project building, never {@code null}.
@@ -76,7 +80,7 @@ public interface ProjectBuilder
/**
* Builds the projects for the specified POM files and optionally their children.
- *
+ *
* @param pomFiles The POM files to build, must not be {@code null}.
* @param recursive {@code true} to recursively build sub modules referenced by the POM files, {@code false} to
* build only the specified POM files.
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java Sat Jun 26 23:16:18 2010
@@ -30,7 +30,7 @@ public interface ProjectBuilderConfigura
extends ProjectBuildingRequest
{
ProjectBuilderConfiguration setLocalRepository( ArtifactRepository localRepository );
-
+
ArtifactRepository getLocalRepository();
ProjectBuilderConfiguration setRemoteRepositories( List<ArtifactRepository> remoteRepositories );
@@ -41,36 +41,36 @@ public interface ProjectBuilderConfigura
Properties getSystemProperties();
- void setProject(MavenProject mavenProject);
+ void setProject( MavenProject mavenProject );
MavenProject getProject();
-
+
ProjectBuilderConfiguration setProcessPlugins( boolean processPlugins );
-
+
boolean isProcessPlugins();
// Profiles
-
+
/**
* Set any active profiles that the {@link ProjectBuilder} should consider while constructing
* a {@link MavenProject}.
*/
void setActiveProfileIds( List<String> activeProfileIds );
-
+
List<String> getActiveProfileIds();
void setInactiveProfileIds( List<String> inactiveProfileIds );
List<String> getInactiveProfileIds();
-
+
/**
- * Add a {@link org.apache.maven.model.Profile} that has come from an external source. This may be from a custom configuration
- * like the MavenCLI settings.xml file, or from a custom dialog in an IDE integration like M2Eclipse.
+ * Add a {@link org.apache.maven.model.Profile} that has come from an external source. This may be from a custom
+ * configuration like the MavenCLI settings.xml file, or from a custom dialog in an IDE integration like M2Eclipse.
* @param profile
*/
void addProfile( Profile profile );
-
+
void setProfiles( List<Profile> profiles );
-
+
List<Profile> getProfiles();
}
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingHelper.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingHelper.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingHelper.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingHelper.java Sat Jun 26 23:16:18 2010
@@ -32,7 +32,7 @@ import org.apache.maven.plugin.version.P
* Assists the project builder. <strong>Warning:</strong> This is an internal utility interface that is only public for
* technical reasons, it is not part of the public API. In particular, this interface can be changed or deleted without
* prior notice.
- *
+ *
* @author Benjamin Bentmann
*/
public interface ProjectBuildingHelper
@@ -40,7 +40,7 @@ public interface ProjectBuildingHelper
/**
* Creates the effective artifact repositories from the specified POM repositories.
- *
+ *
* @param pomRepositories The POM repositories to create the artifact repositories from, must not be {@code null}.
* @param externalRepositories The external (and already mirrored) repositories to merge into the result list, may
* be {@code null}.
@@ -56,7 +56,7 @@ public interface ProjectBuildingHelper
/**
* Creates the project realm that hosts the build extensions of the specified model.
- *
+ *
* @param project The project to create the project realm for, must not be {@code null}
* @param model The model to create the project realm for, must not be {@code null}
* @param request The project building request holding further settings like repository settings, must not be
@@ -64,14 +64,15 @@ public interface ProjectBuildingHelper
* @return The record with the project realm and extension artifact filter, never {@code null}.
* @throws PluginResolutionException If any build extension could not be resolved.
*/
- ProjectRealmCache.CacheRecord createProjectRealm( MavenProject project, Model model, ProjectBuildingRequest request )
+ ProjectRealmCache.CacheRecord createProjectRealm( MavenProject project, Model model,
+ ProjectBuildingRequest request )
throws PluginResolutionException, PluginVersionResolutionException;
/**
* Updates the context class loader such that the container will search the project realm when the model builder
* injects the lifecycle bindings from the packaging in the next step. The context class loader is to be reset by
* the project builder when the project is fully assembled.
- *
+ *
* @param project The project whose class realm should be selected, must not be {@code null}.
*/
void selectProjectRealm( MavenProject project );
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java Sat Jun 26 23:16:18 2010
@@ -26,7 +26,6 @@ import java.util.Properties;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.RepositoryCache;
import org.apache.maven.model.Profile;
-import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.repository.ArtifactTransferListener;
import org.apache.maven.settings.Mirror;
import org.apache.maven.settings.Proxy;
@@ -48,7 +47,7 @@ public interface ProjectBuildingRequest
RepositoryCache getRepositoryCache();
ProjectBuildingRequest setLocalRepository( ArtifactRepository localRepository );
-
+
ArtifactRepository getLocalRepository();
ProjectBuildingRequest setRemoteRepositories( List<ArtifactRepository> remoteRepositories );
@@ -74,7 +73,7 @@ public interface ProjectBuildingRequest
/**
* Sets the system properties to use for interpolation and profile activation. The system properties are collected
* from the runtime environment like {@link System#getProperties()} and environment variables.
- *
+ *
* @param systemProperties The system properties, may be {@code null}.
* @return This request, never {@code null}.
*/
@@ -83,7 +82,7 @@ public interface ProjectBuildingRequest
/**
* Gets the system properties to use for interpolation and profile activation. The system properties are collected
* from the runtime environment like {@link System#getProperties()} and environment variables.
- *
+ *
* @return The system properties, never {@code null}.
*/
Properties getSystemProperties();
@@ -92,7 +91,7 @@ public interface ProjectBuildingRequest
* Sets the user properties to use for interpolation and profile activation. The user properties have been
* configured directly by the user on his discretion, e.g. via the {@code -Dkey=value} parameter on the command
* line.
- *
+ *
* @param userProperties The user properties, may be {@code null}.
* @return This request, never {@code null}.
*/
@@ -102,12 +101,12 @@ public interface ProjectBuildingRequest
* Gets the user properties to use for interpolation and profile activation. The user properties have been
* configured directly by the user on his discretion, e.g. via the {@code -Dkey=value} parameter on the command
* line.
- *
+ *
* @return The user properties, never {@code null}.
*/
Properties getUserProperties();
- void setProject(MavenProject mavenProject);
+ void setProject( MavenProject mavenProject );
MavenProject getProject();
@@ -121,7 +120,7 @@ public interface ProjectBuildingRequest
/**
* Controls the level of validation to perform on processed models. By default, models are validated in strict mode.
- *
+ *
* @param validationLevel The level of validation to perform on processed models, e.g.
* {@link ModelBuildingRequest#VALIDATION_LEVEL_STRICT}.
* @return This configuration, never {@code null}.
@@ -130,46 +129,46 @@ public interface ProjectBuildingRequest
/**
* Gets the level of validation to perform on processed models.
- *
+ *
* @return The level of validation to perform on processed models.
*/
int getValidationLevel();
// Profiles
-
+
/**
* Set any active profiles that the {@link ProjectBuilder} should consider while constructing
* a {@link MavenProject}.
*/
void setActiveProfileIds( List<String> activeProfileIds );
-
+
List<String> getActiveProfileIds();
void setInactiveProfileIds( List<String> inactiveProfileIds );
List<String> getInactiveProfileIds();
-
+
/**
- * Add a {@link org.apache.maven.model.Profile} that has come from an external source. This may be from a custom configuration
- * like the MavenCLI settings.xml file, or from a custom dialog in an IDE integration like M2Eclipse.
+ * Add a {@link org.apache.maven.model.Profile} that has come from an external source. This may be from a custom
+ * configuration like the MavenCLI settings.xml file, or from a custom dialog in an IDE integration like M2Eclipse.
* @param profile
*/
void addProfile( Profile profile );
-
+
void setProfiles( List<Profile> profiles );
-
+
List<Profile> getProfiles();
/**
* Gets the start time of the build.
- *
+ *
* @return The start time of the build or {@code null} if unknown.
*/
Date getBuildStartTime();
/**
* Sets the start time of the build.
- *
+ *
* @param buildStartTime The start time of the build, may be {@code null}.
* @return This request, never {@code null}.
*/
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java Sat Jun 26 23:16:18 2010
@@ -42,7 +42,7 @@ public class ProjectSorter
private DAG dag;
private List<MavenProject> sortedProjects;
-
+
private Map<String, MavenProject> projectMap;
private MavenProject topLevelProject;
@@ -120,7 +120,8 @@ public class ProjectSorter
if ( parent != null )
{
- // Parent is added as an edge, but must not cause a cycle - so we remove any other edges it has in conflict
+ // Parent is added as an edge, but must not cause a cycle - so we remove any other edges it has
+ // in conflict
addEdge( projectMap, vertexMap, null, projectVertex, parent.getGroupId(), parent.getArtifactId(),
parent.getVersion(), true, false );
}
@@ -273,15 +274,15 @@ public class ProjectSorter
{
return ArtifactUtils.key( project.getGroupId(), project.getArtifactId(), project.getVersion() );
}
-
+
public DAG getDAG()
{
return dag;
}
-
+
public Map<String, MavenProject> getProjectMap()
{
return projectMap;
}
-
+
}
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java Sat Jun 26 23:16:18 2010
@@ -1,21 +1,24 @@
package org.apache.maven.project.artifact;
/*
- * 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;
import java.util.ArrayList;
import java.util.Iterator;
@@ -39,8 +42,8 @@ public class DefaultMavenMetadataCache
{
protected final Map<CacheKey, CacheRecord> cache = new ConcurrentHashMap<CacheKey, CacheRecord>();
-
- public static class CacheKey
+
+ public static class CacheKey
{
private final Artifact artifact;
private final long pomHash;
@@ -85,12 +88,12 @@ public class DefaultMavenMetadataCache
{
return true;
}
-
- if ( !(o instanceof CacheKey) )
+
+ if ( !( o instanceof CacheKey ) )
{
return false;
}
-
+
CacheKey other = (CacheKey) o;
return pomHash == other.pomHash && artifactEquals( artifact, other.artifact )
@@ -111,7 +114,7 @@ public class DefaultMavenMetadataCache
}
result = 31 * result + ( a.getClassifier() != null ? a.getClassifier().hashCode() : 0 );
result = 31 * result + ( a.getScope() != null ? a.getScope().hashCode() : 0 );
- result = 31 * result + ( a.getDependencyFilter() != null? a.getDependencyFilter().hashCode() : 0 );
+ result = 31 * result + ( a.getDependencyFilter() != null ? a.getDependencyFilter().hashCode() : 0 );
result = 31 * result + ( a.isOptional() ? 1 : 0 );
return result;
}
@@ -192,7 +195,7 @@ public class DefaultMavenMetadataCache
private static <T> boolean eq( T s1, T s2 )
{
- return s1 != null? s1.equals( s2 ): s2 == null;
+ return s1 != null ? s1.equals( s2 ) : s2 == null;
}
public class CacheRecord
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/InvalidDependencyVersionException.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/InvalidDependencyVersionException.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/InvalidDependencyVersionException.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/InvalidDependencyVersionException.java Sat Jun 26 23:16:18 2010
@@ -1,12 +1,5 @@
package org.apache.maven.project.artifact;
-import java.io.File;
-
-import org.apache.maven.artifact.ArtifactUtils;
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.model.Dependency;
-import org.apache.maven.project.InvalidProjectVersionException;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -26,6 +19,13 @@ import org.apache.maven.project.InvalidP
* under the License.
*/
+import java.io.File;
+
+import org.apache.maven.artifact.ArtifactUtils;
+import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.project.InvalidProjectVersionException;
+
/**
* Thrown if a dependency has an invalid version.
*
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java Sat Jun 26 23:16:18 2010
@@ -1,27 +1,30 @@
package org.apache.maven.project.artifact;
+/*
+ * 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.util.List;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.metadata.ResolutionGroup;
-/*
- * 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.
- */
-
-
public interface MavenMetadataCache
{
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java Sat Jun 26 23:16:18 2010
@@ -1,18 +1,22 @@
package org.apache.maven.project.artifact;
/*
- * 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;
@@ -29,7 +33,6 @@ import java.util.Properties;
import java.util.Set;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
@@ -87,7 +90,7 @@ public class MavenMetadataSource
@Requirement
private ArtifactFactory repositorySystem;
- //TODO: This prevents a cycle in the composition which shows us another problem we need to deal with.
+ //TODO: This prevents a cycle in the composition which shows us another problem we need to deal with.
//@Requirement
private ProjectBuilder projectBuilder;
@@ -98,7 +101,7 @@ public class MavenMetadataSource
private Logger logger;
@Requirement
- private MavenMetadataCache cache;
+ private MavenMetadataCache cache;
@Requirement
private LegacySupport legacySupport;
@@ -187,7 +190,7 @@ public class MavenMetadataSource
else
{
ProjectRelocation rel = retrieveRelocatedProject( artifact, request );
-
+
if ( rel == null )
{
return null;
@@ -215,8 +218,8 @@ public class MavenMetadataSource
}
}
- Set<Artifact> artifacts = Collections.<Artifact>emptySet();
-
+ Set<Artifact> artifacts = Collections.<Artifact>emptySet();
+
if ( !artifact.getArtifactHandler().isIncludesDependencies() )
{
artifacts = new LinkedHashSet<Artifact>();
@@ -312,8 +315,8 @@ public class MavenMetadataSource
}
}
- private static Artifact createDependencyArtifact( ArtifactFactory factory, Dependency dependency, String inheritedScope,
- ArtifactFilter inheritedFilter )
+ private static Artifact createDependencyArtifact( ArtifactFactory factory, Dependency dependency,
+ String inheritedScope, ArtifactFilter inheritedFilter )
throws InvalidVersionSpecificationException
{
String effectiveScope = getEffectiveScope( dependency.getScope(), inheritedScope );
@@ -412,7 +415,8 @@ public class MavenMetadataSource
return effectiveFilter;
}
- public List<ArtifactVersion> retrieveAvailableVersions( Artifact artifact, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
+ public List<ArtifactVersion> retrieveAvailableVersions( Artifact artifact, ArtifactRepository localRepository,
+ List<ArtifactRepository> remoteRepositories )
throws ArtifactMetadataRetrievalException
{
MetadataResolutionRequest request = new DefaultMetadataResolutionRequest();
@@ -442,7 +446,9 @@ public class MavenMetadataSource
return retrieveAvailableVersionsFromMetadata( metadata.getMetadata(), availableVersions );
}
- public List<ArtifactVersion> retrieveAvailableVersionsFromDeploymentRepository( Artifact artifact, ArtifactRepository localRepository, ArtifactRepository deploymentRepository )
+ public List<ArtifactVersion> retrieveAvailableVersionsFromDeploymentRepository( Artifact artifact,
+ ArtifactRepository localRepository,
+ ArtifactRepository deploymentRepository )
throws ArtifactMetadataRetrievalException
{
RepositoryMetadata metadata = new ArtifactRepositoryMetadata( artifact );
@@ -461,7 +467,8 @@ public class MavenMetadataSource
return retrieveAvailableVersionsFromMetadata( metadata.getMetadata(), availableVersions );
}
- private List<ArtifactVersion> retrieveAvailableVersionsFromMetadata( Metadata repoMetadata, List<String> availableVersions )
+ private List<ArtifactVersion> retrieveAvailableVersionsFromMetadata( Metadata repoMetadata,
+ List<String> availableVersions )
{
Collection<String> versions = new LinkedHashSet<String>();
@@ -482,9 +489,11 @@ public class MavenMetadataSource
return artifactVersions;
}
- // USED BY MAVEN ASSEMBLY PLUGIN
+ // USED BY MAVEN ASSEMBLY PLUGIN
@Deprecated
- public static Set<Artifact> createArtifacts( ArtifactFactory artifactFactory, List<Dependency> dependencies, String inheritedScope, ArtifactFilter dependencyFilter, MavenProject project )
+ public static Set<Artifact> createArtifacts( ArtifactFactory artifactFactory, List<Dependency> dependencies,
+ String inheritedScope, ArtifactFilter dependencyFilter,
+ MavenProject project )
throws InvalidDependencyVersionException
{
Set<Artifact> artifacts = new LinkedHashSet<Artifact>();
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/PluginArtifact.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/PluginArtifact.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/PluginArtifact.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/PluginArtifact.java Sat Jun 26 23:16:18 2010
@@ -36,7 +36,8 @@ public class PluginArtifact
public PluginArtifact( Plugin plugin, Artifact pluginArtifact )
{
- super( plugin.getGroupId(), plugin.getArtifactId(), plugin.getVersion(), null, "maven-plugin", null, new PluginArtifactHandler() );
+ super( plugin.getGroupId(), plugin.getArtifactId(), plugin.getVersion(), null, "maven-plugin", null,
+ new PluginArtifactHandler() );
this.plugin = plugin;
setFile( pluginArtifact.getFile() );
setResolved( true );
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java Sat Jun 26 23:16:18 2010
@@ -36,7 +36,8 @@ public class ProjectArtifact
public ProjectArtifact( MavenProject project )
{
- super( project.getGroupId(), project.getArtifactId(), project.getVersion(), null, "pom", null, new PomArtifactHandler() );
+ super( project.getGroupId(), project.getArtifactId(), project.getVersion(), null, "pom", null,
+ new PomArtifactHandler() );
this.project = project;
setFile( project.getFile() );
setResolved( true );
@@ -46,7 +47,7 @@ public class ProjectArtifact
{
return project;
}
-
+
public List<Dependency> getDependencies()
{
return project.getDependencies();
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java Sat Jun 26 23:16:18 2010
@@ -69,7 +69,9 @@ public class ProjectArtifactMetadata
public void storeInLocalRepository( ArtifactRepository localRepository, ArtifactRepository remoteRepository )
throws RepositoryMetadataStoreException
{
- File destination = new File( localRepository.getBasedir(), localRepository.pathOfLocalRepositoryMetadata( this, remoteRepository ) );
+ File destination =
+ new File( localRepository.getBasedir(), localRepository.pathOfLocalRepositoryMetadata( this,
+ remoteRepository ) );
// ----------------------------------------------------------------------------
// I'm fully aware that the file could just be moved using File.rename but
@@ -119,6 +121,6 @@ public class ProjectArtifactMetadata
public void merge( org.apache.maven.repository.legacy.metadata.ArtifactMetadata metadata )
{
- this.merge( (ArtifactMetadata)metadata );
+ this.merge( (ArtifactMetadata) metadata );
}
}
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java Sat Jun 26 23:16:18 2010
@@ -40,17 +40,17 @@ import org.apache.maven.settings.Server;
*/
public interface RepositorySystem
{
- static final String DEFAULT_LOCAL_REPO_ID = "local";
-
- static final String userHome = System.getProperty( "user.home" );
-
- static final File userMavenConfigurationHome = new File( userHome, ".m2" );
-
- static final File defaultUserLocalRepository = new File( userMavenConfigurationHome, "repository" );
-
- static final String DEFAULT_REMOTE_REPO_ID = "central";
+ final String DEFAULT_LOCAL_REPO_ID = "local";
- static final String DEFAULT_REMOTE_REPO_URL = "http://repo1.maven.org/maven2";
+ final String userHome = System.getProperty( "user.home" );
+
+ final File userMavenConfigurationHome = new File( userHome, ".m2" );
+
+ final File defaultUserLocalRepository = new File( userMavenConfigurationHome, "repository" );
+
+ final String DEFAULT_REMOTE_REPO_ID = "central";
+
+ final String DEFAULT_REMOTE_REPO_URL = "http://repo1.maven.org/maven2";
Artifact createArtifact( String groupId, String artifactId, String version, String packaging );
@@ -58,40 +58,42 @@ public interface RepositorySystem
Artifact createProjectArtifact( String groupId, String artifactId, String version );
- Artifact createArtifactWithClassifier( String groupId, String artifactId, String version, String type, String classifier );
-
+ Artifact createArtifactWithClassifier( String groupId, String artifactId, String version, String type,
+ String classifier );
+
Artifact createPluginArtifact( Plugin plugin );
-
+
Artifact createDependencyArtifact( Dependency dependency );
-
+
ArtifactRepository buildArtifactRepository( Repository repository )
throws InvalidRepositoryException;
-
+
ArtifactRepository createDefaultRemoteRepository()
- throws InvalidRepositoryException;
-
+ throws InvalidRepositoryException;
+
ArtifactRepository createDefaultLocalRepository()
throws InvalidRepositoryException;
-
+
ArtifactRepository createLocalRepository( File localRepository )
throws InvalidRepositoryException;
- ArtifactRepository createArtifactRepository( String id, String url, ArtifactRepositoryLayout repositoryLayout, ArtifactRepositoryPolicy snapshots, ArtifactRepositoryPolicy releases );
+ ArtifactRepository createArtifactRepository( String id, String url, ArtifactRepositoryLayout repositoryLayout,
+ ArtifactRepositoryPolicy snapshots, ArtifactRepositoryPolicy releases );
/**
* Calculates the effective repositories for the given input repositories which are assumed to be already mirrored
* (if applicable). This process will essentially remove duplicate repositories by merging them into one equivalent
* repository. It is worth to point out that merging does not simply choose one of the input repositories and
* discards the others but actually combines their possibly different policies.
- *
+ *
* @param repositories The original repositories, may be {@code null}.
* @return The effective repositories or {@code null} if the input was {@code null}.
*/
- List<ArtifactRepository> getEffectiveRepositories( List<ArtifactRepository> repositories );
+ List<ArtifactRepository> getEffectiveRepositories( List<ArtifactRepository> repositories );
/**
* Determines the mirror for the specified repository.
- *
+ *
* @param repository The repository to determine the mirror for, must not be {@code null}.
* @param mirrors The available mirrors, may be {@code null}.
* @return The mirror specification for the repository or {@code null} if no mirror matched.
@@ -103,7 +105,7 @@ public interface RepositorySystem
* mirror, its URL and ID will be updated to match the values from the mirror specification. Repositories without a
* matching mirror will pass through unchanged. <em>Note:</em> This method must be called before
* {@link #injectAuthentication(List, List)} or the repositories will end up with the wrong credentials.
- *
+ *
* @param repositories The repositories into which to inject the mirror information, may be {@code null}.
* @param mirrors The available mirrors, may be {@code null}.
*/
@@ -114,7 +116,7 @@ public interface RepositorySystem
* its proxy data will be set accordingly. Repositories without a matching proxy will have their proxy cleared.
* <em>Note:</em> This method must be called after {@link #injectMirror(List, List)} or the repositories will end up
* with the wrong proxies.
- *
+ *
* @param repositories The repositories into which to inject the proxy information, may be {@code null}.
* @param proxies The available proxies, may be {@code null}.
*/
@@ -125,7 +127,7 @@ public interface RepositorySystem
* server, its credentials will be updated to match the values from the server specification. Repositories without a
* matching server will have their credentials cleared. <em>Note:</em> This method must be called after
* {@link #injectMirror(List, List)} or the repositories will end up with the wrong credentials.
- *
+ *
* @param repositories The repositories into which to inject the authentication information, may be {@code null}.
* @param servers The available servers, may be {@code null}.
*/
@@ -134,18 +136,20 @@ public interface RepositorySystem
ArtifactResolutionResult resolve( ArtifactResolutionRequest request );
// Install
-
+
// Deploy
-
+
// Map types of artifacts
-
+
//
// Raw file transfers
//
- void publish( ArtifactRepository repository, File source, String remotePath, ArtifactTransferListener transferListener )
+ void publish( ArtifactRepository repository, File source, String remotePath,
+ ArtifactTransferListener transferListener )
throws ArtifactTransferFailedException;
-
- void retrieve( ArtifactRepository repository, File destination, String remotePath, ArtifactTransferListener transferListener )
- throws ArtifactTransferFailedException, ArtifactDoesNotExistException;
+
+ void retrieve( ArtifactRepository repository, File destination, String remotePath,
+ ArtifactTransferListener transferListener )
+ throws ArtifactTransferFailedException, ArtifactDoesNotExistException;
}
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataSource.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataSource.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataSource.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataSource.java Sat Jun 26 23:16:18 2010
@@ -38,7 +38,8 @@ public interface ArtifactMetadataSource
ResolutionGroup retrieve( MetadataResolutionRequest request )
throws ArtifactMetadataRetrievalException;
- ResolutionGroup retrieve( Artifact artifact, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
+ ResolutionGroup retrieve( Artifact artifact, ArtifactRepository localRepository,
+ List<ArtifactRepository> remoteRepositories )
throws ArtifactMetadataRetrievalException;
/**
@@ -53,7 +54,8 @@ public interface ArtifactMetadataSource
* @throws ArtifactMetadataRetrievalException
* in case of error while retrieving repository metadata from the repository.
*/
- List<ArtifactVersion> retrieveAvailableVersions( Artifact artifact, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
+ List<ArtifactVersion> retrieveAvailableVersions( Artifact artifact, ArtifactRepository localRepository,
+ List<ArtifactRepository> remoteRepositories )
throws ArtifactMetadataRetrievalException;
/**
@@ -69,7 +71,9 @@ public interface ArtifactMetadataSource
* @throws ArtifactMetadataRetrievalException
* in case of error while retrieving repository metadata from the repository.
*/
- List<ArtifactVersion> retrieveAvailableVersionsFromDeploymentRepository( Artifact artifact, ArtifactRepository localRepository, ArtifactRepository remoteRepository )
+ List<ArtifactVersion> retrieveAvailableVersionsFromDeploymentRepository( Artifact artifact,
+ ArtifactRepository localRepository,
+ ArtifactRepository remoteRepository )
throws ArtifactMetadataRetrievalException;
}
\ No newline at end of file
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java Sat Jun 26 23:16:18 2010
@@ -36,7 +36,7 @@ import org.codehaus.plexus.util.xml.pull
/**
* @author jdcasey
*/
-@Component(role = MavenSettingsBuilder.class)
+@Component( role = MavenSettingsBuilder.class )
public class DefaultMavenSettingsBuilder
extends AbstractLogEnabled
implements MavenSettingsBuilder
@@ -49,7 +49,8 @@ public class DefaultMavenSettingsBuilder
throws IOException, XmlPullParserException
{
File userSettingsFile =
- getFile( "${user.home}/.m2/settings.xml", "user.home", MavenSettingsBuilder.ALT_USER_SETTINGS_XML_LOCATION );
+ getFile( "${user.home}/.m2/settings.xml", "user.home",
+ MavenSettingsBuilder.ALT_USER_SETTINGS_XML_LOCATION );
return buildSettings( userSettingsFile );
}
@@ -71,7 +72,7 @@ public class DefaultMavenSettingsBuilder
request.setUserSettingsFile( userSettingsFile );
request.setGlobalSettingsFile( globalSettingsFile );
request.setSystemProperties( System.getProperties() );
- return build(request);
+ return build( request );
}
public Settings buildSettings( File userSettingsFile, boolean useCachedSettings )
@@ -102,8 +103,8 @@ public class DefaultMavenSettingsBuilder
settingsRequest.setGlobalSettingsFile( request.getGlobalSettingsFile() );
settingsRequest.setUserProperties( request.getUserProperties() );
settingsRequest.setSystemProperties( request.getSystemProperties() );
-
- return build(settingsRequest);
+
+ return build( settingsRequest );
}
private File getFile( String pathPattern, String basedirSysProp, String altLocationSysProp )
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java Sat Jun 26 23:16:18 2010
@@ -44,7 +44,7 @@ import org.codehaus.plexus.interpolation
/**
* Builds the effective settings from a user settings file and/or a global settings file.
- *
+ *
* @author Benjamin Bentmann
*/
@Component( role = SettingsBuilder.class )
@@ -159,7 +159,8 @@ public class DefaultSettingsBuilder
return settings;
}
- private Settings interpolate( Settings settings, SettingsBuildingRequest request, SettingsProblemCollector problems )
+ private Settings interpolate( Settings settings, SettingsBuildingRequest request,
+ SettingsProblemCollector problems )
{
StringWriter writer = new StringWriter( 1024 * 4 );
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java Sat Jun 26 23:16:18 2010
@@ -34,7 +34,7 @@ import org.codehaus.plexus.util.StringUt
/**
* @author Milos Kleint
*/
-@Component(role = SettingsValidator.class)
+@Component( role = SettingsValidator.class )
public class DefaultSettingsValidator
implements SettingsValidator
{
@@ -108,7 +108,8 @@ public class DefaultSettingsValidator
for ( Profile profile : profiles )
{
validateRepositories( problems, profile.getRepositories(), "repositories.repository" );
- validateRepositories( problems, profile.getPluginRepositories(), "pluginRepositories.pluginRepository" );
+ validateRepositories( problems, profile.getPluginRepositories(),
+ "pluginRepositories.pluginRepository" );
}
}
}
@@ -148,7 +149,8 @@ public class DefaultSettingsValidator
* <li><code>string.length > 0</code>
* </ul>
*/
- private boolean validateStringNotEmpty( SettingsProblemCollector problems, String fieldName, String string, String sourceHint )
+ private boolean validateStringNotEmpty( SettingsProblemCollector problems, String fieldName, String string,
+ String sourceHint )
{
if ( !validateNotNull( problems, fieldName, string, sourceHint ) )
{
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java Sat Jun 26 23:16:18 2010
@@ -1,3 +1,5 @@
+package org.apache.maven.toolchain;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,8 +19,6 @@
* under the License.
*/
-package org.apache.maven.toolchain;
-
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -68,14 +68,13 @@ public abstract class DefaultToolchain
return model;
}
- public final void addProvideToken( String type,
- RequirementMatcher matcher )
+ public final void addProvideToken( String type, RequirementMatcher matcher )
{
provides.put( type, matcher );
}
- public boolean matchesRequirements(Map requirements)
+ public boolean matchesRequirements( Map requirements )
{
Iterator it = requirements.keySet().iterator();
while ( it.hasNext() )
@@ -86,12 +85,12 @@ public abstract class DefaultToolchain
if ( matcher == null )
{
- getLog().debug( "Toolchain " + this + " is missing required property: " + key );
+ getLog().debug( "Toolchain " + this + " is missing required property: " + key );
return false;
}
- if ( !matcher.matches( (String) requirements.get(key) ) )
+ if ( !matcher.matches( (String) requirements.get( key ) ) )
{
- getLog().debug( "Toolchain " + this + " doesn't match required property: " + key );
+ getLog().debug( "Toolchain " + this + " doesn't match required property: " + key );
return false;
}
}
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/MisconfiguredToolchainException.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/MisconfiguredToolchainException.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/MisconfiguredToolchainException.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/MisconfiguredToolchainException.java Sat Jun 26 23:16:18 2010
@@ -1,3 +1,5 @@
+package org.apache.maven.toolchain;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,8 +19,6 @@
* under the License.
*/
-package org.apache.maven.toolchain;
-
/**
*
* @author mkleint
@@ -32,8 +32,7 @@ public class MisconfiguredToolchainExcep
super( message );
}
- public MisconfiguredToolchainException( String message,
- Throwable orig )
+ public MisconfiguredToolchainException( String message, Throwable orig )
{
super( message, orig );
}
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcher.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcher.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcher.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcher.java Sat Jun 26 23:16:18 2010
@@ -1,3 +1,5 @@
+package org.apache.maven.toolchain;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,8 +19,6 @@
* under the License.
*/
-package org.apache.maven.toolchain;
-
/**
*
* @author mkleint
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java Sat Jun 26 23:16:18 2010
@@ -1,3 +1,5 @@
+package org.apache.maven.toolchain;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,8 +19,6 @@
* under the License.
*/
-package org.apache.maven.toolchain;
-
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.artifact.versioning.VersionRange;
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/Toolchain.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/Toolchain.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/Toolchain.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/Toolchain.java Sat Jun 26 23:16:18 2010
@@ -1,3 +1,5 @@
+package org.apache.maven.toolchain;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,9 +19,6 @@
* under the License.
*/
-package org.apache.maven.toolchain;
-
-
/**
* @author Milos Kleint
* @author Jason van Zyl
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java Sat Jun 26 23:16:18 2010
@@ -1,3 +1,5 @@
+package org.apache.maven.toolchain;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,8 +19,6 @@
* under the License.
*/
-package org.apache.maven.toolchain;
-
import org.apache.maven.toolchain.model.ToolchainModel;
/**
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java Sat Jun 26 23:16:18 2010
@@ -1,3 +1,5 @@
+package org.apache.maven.toolchain;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,8 +19,6 @@
* under the License.
*/
-package org.apache.maven.toolchain;
-
import org.apache.maven.execution.MavenSession;
@@ -36,6 +36,5 @@ public interface ToolchainManager
/**
* to be used from plugins capable of working with toolchains.
*/
- Toolchain getToolchainFromBuildContext( String type,
- MavenSession context );
+ Toolchain getToolchainFromBuildContext( String type, MavenSession context );
}
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java Sat Jun 26 23:16:18 2010
@@ -1,3 +1,5 @@
+package org.apache.maven.toolchain;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,9 +19,6 @@
* under the License.
*/
-
-package org.apache.maven.toolchain;
-
import org.apache.maven.execution.MavenSession;
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java Sat Jun 26 23:16:18 2010
@@ -1,3 +1,5 @@
+package org.apache.maven.toolchain;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,8 +19,6 @@
* under the License.
*/
-package org.apache.maven.toolchain;
-
import java.util.Map;
import org.apache.maven.toolchain.model.ToolchainModel;
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java Sat Jun 26 23:16:18 2010
@@ -1,3 +1,5 @@
+package org.apache.maven.toolchain.java;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,8 +19,6 @@
* under the License.
*/
-package org.apache.maven.toolchain.java;
-
import java.io.File;
import org.apache.maven.toolchain.DefaultToolchain;
@@ -31,7 +31,7 @@ import org.codehaus.plexus.util.Os;
/**
* @author Milos Kleint
*/
-@Component(role=JavaToolChain.class)
+@Component( role = JavaToolChain.class )
public class DefaultJavaToolChain
extends DefaultToolchain
implements JavaToolChain
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java Sat Jun 26 23:16:18 2010
@@ -1,3 +1,5 @@
+package org.apache.maven.toolchain.java;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,8 +19,6 @@
* under the License.
*/
-package org.apache.maven.toolchain.java;
-
import java.io.File;
import org.apache.maven.toolchain.MisconfiguredToolchainException;
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolChain.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolChain.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolChain.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolChain.java Sat Jun 26 23:16:18 2010
@@ -1,3 +1,5 @@
+package org.apache.maven.toolchain.java;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,11 +19,8 @@
* under the License.
*/
-package org.apache.maven.toolchain.java;
-
import org.apache.maven.toolchain.Toolchain;
-
/**
* @author Jason van Zyl
* @author Milos Kleint
Modified: maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java (original)
+++ maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.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.PrintStream;
@@ -96,7 +100,7 @@ public class CLIManager
private Options options;
- @SuppressWarnings("static-access")
+ @SuppressWarnings( "static-access" )
public CLIManager()
{
options = new Options();
@@ -132,7 +136,7 @@ public class CLIManager
options.addOption( OptionBuilder.withLongOpt( "threads" ).hasArg().withDescription( "Thread count, for instance 2.0C where C is core multiplied" ).create( THREADS ) );
// Adding this back in for compatibility with the verifier that hard codes this option.
-
+
options.addOption( OptionBuilder.withLongOpt( "no-plugin-registry" ).withDescription( "Ineffective, only kept for backward compatibility" ).create( "npr" ) );
options.addOption( OptionBuilder.withLongOpt( "check-plugin-updates" ).withDescription( "Ineffective, only kept for backward compatibility" ).create( "cpu" ) );
options.addOption( OptionBuilder.withLongOpt( "update-plugins" ).withDescription( "Ineffective, only kept for backward compatibility" ).create( "up" ) );
Modified: maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java (original)
+++ maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java Sat Jun 26 23:16:18 2010
@@ -164,7 +164,8 @@ public final class CLIReportingUtils
InputStream resourceAsStream = null;
try
{
- resourceAsStream = MavenCli.class.getClassLoader().getResourceAsStream( "org/apache/maven/messages/build.properties" );
+ resourceAsStream =
+ MavenCli.class.getClassLoader().getResourceAsStream( "org/apache/maven/messages/build.properties" );
if ( resourceAsStream != null )
{
Modified: maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/ExecutionEventLogger.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/ExecutionEventLogger.java?rev=958295&r1=958294&r2=958295&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/ExecutionEventLogger.java (original)
+++ maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/ExecutionEventLogger.java Sat Jun 26 23:16:18 2010
@@ -37,7 +37,7 @@ import org.codehaus.plexus.logging.Logge
/**
* Logs execution events to a user-supplied logger.
- *
+ *
* @author Benjamin Bentmann
*/
class ExecutionEventLogger
@@ -204,7 +204,7 @@ class ExecutionEventLogger
String wallClock = session.getRequest().isThreadConfigurationPresent() ? " (Wall Clock)" : "";
- logger.info( "Total time: " + getFormattedTime( time ) + wallClock);
+ logger.info( "Total time: " + getFormattedTime( time ) + wallClock );
logger.info( "Finished at: " + finish );