You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2008/08/19 00:54:02 UTC
svn commit: r686890 - in
/maven/components/branches/sisbell-maven-2.1-profile:
maven-core/src/main/java/org/apache/maven/
maven-core/src/main/java/org/apache/maven/execution/
maven-core/src/main/java/org/apache/maven/lifecycle/binding/
maven-embedder/s...
Author: sisbell
Date: Mon Aug 18 15:54:01 2008
New Revision: 686890
URL: http://svn.apache.org/viewvc?rev=686890&view=rev
Log:
Nuked spaghetti code.
Removed:
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultRepositoryHelper.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/MavenProjectHelper.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/MavenProjectRestorer.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/ProjectSorter.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/ProjectUtils.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/RepositoryHelper.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/artifact/
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/build/model/
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/error/
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/inheritance/
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/injection/
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/profiles/
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/workspace/
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/realm/
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/profiles/
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/ModelUtilsTest.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/artifact/
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/build/model/
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/injection/
Modified:
maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/ProjectCycleException.java
maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java
maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/lifecycle/binding/BindingUtils.java
maven/components/branches/sisbell-maven-2.1-profile/maven-embedder/src/test/java/org/apache/maven/error/DummyCoreErrorReporter.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/pom.xml
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/ProjectBuildingException.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultImportModel.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectHelperTest.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/SuperPomProjectBuilderTest.java
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/ProjectCycleException.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/ProjectCycleException.java?rev=686890&r1=686889&r2=686890&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/ProjectCycleException.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/ProjectCycleException.java Mon Aug 18 15:54:01 2008
@@ -1,7 +1,6 @@
package org.apache.maven;
import org.apache.maven.execution.ReactorManager;
-import org.apache.maven.project.ProjectSorter;
import org.codehaus.plexus.util.dag.CycleDetectedException;
import java.util.List;
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java?rev=686890&r1=686889&r2=686890&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java Mon Aug 18 15:54:01 2008
@@ -24,7 +24,6 @@
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.project.DuplicateProjectException;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.ProjectSorter;
import org.codehaus.plexus.util.dag.CycleDetectedException;
import java.util.ArrayList;
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/lifecycle/binding/BindingUtils.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/lifecycle/binding/BindingUtils.java?rev=686890&r1=686889&r2=686890&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/lifecycle/binding/BindingUtils.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/lifecycle/binding/BindingUtils.java Mon Aug 18 15:54:01 2008
@@ -14,7 +14,6 @@
import org.apache.maven.model.Reporting;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.ModelUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import java.util.HashMap;
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-embedder/src/test/java/org/apache/maven/error/DummyCoreErrorReporter.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-embedder/src/test/java/org/apache/maven/error/DummyCoreErrorReporter.java?rev=686890&r1=686889&r2=686890&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-embedder/src/test/java/org/apache/maven/error/DummyCoreErrorReporter.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-embedder/src/test/java/org/apache/maven/error/DummyCoreErrorReporter.java Mon Aug 18 15:54:01 2008
@@ -45,7 +45,6 @@
import org.apache.maven.profiles.activation.ProfileActivator;
import org.apache.maven.project.DuplicateProjectException;
import org.apache.maven.project.InvalidProjectModelException;
-import org.apache.maven.project.InvalidProjectVersionException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/pom.xml?rev=686890&r1=686889&r2=686890&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/pom.xml (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/pom.xml Mon Aug 18 15:54:01 2008
@@ -78,6 +78,7 @@
<artifactId>maven-shared-model</artifactId>
</dependency>
</dependencies>
+ <!--
<build>
<plugins>
<plugin>
@@ -95,4 +96,5 @@
</plugin>
</plugins>
</build>
+ -->
</project>
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=686890&r1=686889&r2=686890&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Mon Aug 18 15:54:01 2008
@@ -30,29 +30,16 @@
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.ArtifactResolver;
-import org.apache.maven.model.*;
+import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.profiles.MavenProfilesBuilder;
-import org.apache.maven.profiles.ProfileManager;
-import org.apache.maven.profiles.activation.DefaultProfileActivationContext;
-import org.apache.maven.profiles.activation.ProfileActivationContext;
-import org.apache.maven.profiles.activation.ProfileActivationException;
-import org.apache.maven.profiles.build.ProfileAdvisor;
-import org.apache.maven.project.artifact.InvalidDependencyVersionException;
-import org.apache.maven.project.build.model.DefaultModelLineage;
-import org.apache.maven.project.build.model.ModelLineage;
-import org.apache.maven.project.build.model.ModelLineageBuilder;
-import org.apache.maven.project.build.model.ModelLineageIterator;
import org.apache.maven.project.builder.PomArtifactResolver;
import org.apache.maven.project.builder.ProjectBuilder;
-import org.apache.maven.project.inheritance.ModelInheritanceAssembler;
-import org.apache.maven.project.injection.ModelDefaultsInjector;
import org.apache.maven.project.interpolation.ModelInterpolationException;
import org.apache.maven.project.interpolation.ModelInterpolator;
import org.apache.maven.project.path.PathTranslator;
import org.apache.maven.project.validation.ModelValidationResult;
import org.apache.maven.project.validation.ModelValidator;
-import org.apache.maven.project.workspace.ProjectWorkspace;
import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
@@ -113,8 +100,6 @@
private ArtifactFactory artifactFactory;
- private ModelInheritanceAssembler modelInheritanceAssembler;
-
private ModelValidator validator;
// TODO: make it a component
@@ -122,22 +107,12 @@
private PathTranslator pathTranslator;
- private ModelDefaultsInjector modelDefaultsInjector;
-
private ModelInterpolator modelInterpolator;
- private ModelLineageBuilder modelLineageBuilder;
-
- private ProfileAdvisor profileAdvisor;
-
private MavenTools mavenTools;
- private ProjectWorkspace projectWorkspace;
-
private ProjectBuilder projectBuilder;
- private RepositoryHelper repositoryHelper;
-
private ArtifactRepositoryLayout artifactRepositoryLayout;
private Logger logger;
@@ -154,24 +129,6 @@
modelReader = new MavenXpp3Reader();
}
- // ----------------------------------------------------------------------
- // MavenProjectBuilder Implementation
- // ----------------------------------------------------------------------
-
- public MavenProject build(File projectDescriptor,
- ArtifactRepository localRepository,
- ProfileManager profileManager)
- throws ProjectBuildingException {
-
- if (projectDescriptor == null) {
- throw new IllegalArgumentException("projectDescriptor: null");
- }
- ProjectBuilderConfiguration config = new DefaultProjectBuilderConfiguration().setLocalRepository(localRepository)
- .setGlobalProfileManager(profileManager);
-
- return build(projectDescriptor, config);
- }
-
public MavenProject build(File projectDescriptor,
ProjectBuilderConfiguration config)
throws ProjectBuildingException {
@@ -181,7 +138,7 @@
}
return readMavenProjectFromLocalPath("unknown", projectDescriptor, new PomArtifactResolver(config.getLocalRepository(),
- repositoryHelper.buildArtifactRepositories(getSuperModel()), artifactResolver));
+ null, artifactResolver));
/*
Model model = readModelFromLocalPath("unknown", projectDescriptor, new PomArtifactResolver(config.getLocalRepository(),
@@ -229,7 +186,7 @@
}
return readMavenProjectFromLocalPath("unknown", artifact.getFile(), new PomArtifactResolver(localRepository,
- repositoryHelper.buildArtifactRepositories(getSuperModel()), artifactResolver));
+ null, artifactResolver));
/*
MavenProject project = null;
if (!Artifact.LATEST_VERSION.equals(artifact.getVersion()) && !Artifact.RELEASE_VERSION.equals(artifact.getVersion())) {
@@ -256,12 +213,6 @@
return buildStandaloneSuperProject(new DefaultProjectBuilderConfiguration());
}
- public MavenProject buildStandaloneSuperProject(ProfileManager profileManager)
- throws ProjectBuildingException {
- //TODO mkleint - use the (Container, Properties) constructor to make system properties embeddable
- return buildStandaloneSuperProject(new DefaultProjectBuilderConfiguration().setGlobalProfileManager(profileManager));
- }
-
public MavenProject buildStandaloneSuperProject(ProjectBuilderConfiguration config)
throws ProjectBuildingException {
Model superModel = getSuperModel();
@@ -272,26 +223,11 @@
superModel.setVersion(STANDALONE_SUPERPOM_VERSION);
- superModel = ModelUtils.cloneModel(superModel);
-
- ProfileManager profileManager = config.getGlobalProfileManager();
-
- List activeProfiles = new ArrayList();
- if (profileManager != null) {
- List activated = profileAdvisor.applyActivatedProfiles(superModel, null, false, profileManager.getProfileActivationContext());
- if (!activated.isEmpty()) {
- activeProfiles.addAll(activated);
- }
-
- activated = profileAdvisor.applyActivatedExternalProfiles(superModel, null, profileManager);
- if (!activated.isEmpty()) {
- activeProfiles.addAll(activated);
- }
- }
+ // superModel = ModelUtils.cloneModel(superModel);
MavenProject project;
try {
- project = new MavenProject(superModel, artifactFactory, mavenTools, repositoryHelper);
+ project = new MavenProject(superModel, artifactFactory, mavenTools);
} catch (InvalidRepositoryException e) {
throw new ProjectBuildingException(STANDALONE_SUPERPOM_GROUPID + ":"
+ STANDALONE_SUPERPOM_ARTIFACTID,
@@ -299,9 +235,6 @@
e);
}
- getLogger().debug("Activated the following profiles for standalone super-pom: " + activeProfiles);
- project.setActiveProfiles(activeProfiles);
-
try {
// processProjectLogic(project, null, config);
@@ -333,28 +266,6 @@
return project;
}
- /**
- * @since 2.0.x
- */
- public MavenProject buildWithDependencies(File projectDescriptor,
- ArtifactRepository localRepository,
- ProfileManager profileManager)
- throws ProjectBuildingException {
- return buildProjectWithDependencies(projectDescriptor, localRepository, profileManager).getProject();
- }
-
- /**
- * @since 2.1
- */
- public MavenProjectBuildingResult buildProjectWithDependencies(File projectDescriptor,
- ArtifactRepository localRepository,
- ProfileManager profileManager)
- throws ProjectBuildingException {
- ProjectBuilderConfiguration config = new DefaultProjectBuilderConfiguration().setLocalRepository(localRepository)
- .setGlobalProfileManager(profileManager);
-
- return buildProjectWithDependencies(projectDescriptor, config);
- }
public MavenProjectBuildingResult buildProjectWithDependencies(File projectDescriptor,
ProjectBuilderConfiguration config)
@@ -389,15 +300,8 @@
project.setArtifact(projectArtifact);
Map managedVersions = project.getManagedVersionMap();
+ //project.setDependencyArtifacts(project.createArtifacts(artifactFactory, null));
- try {
- project.setDependencyArtifacts(project.createArtifacts(artifactFactory, null, null));
- }
- catch (InvalidDependencyVersionException e) {
- throw new ProjectBuildingException(projectId,
- "Unable to build project due to an invalid dependency version: " +
- e.getMessage(), projectDescriptor, e);
- }
ArtifactResolutionRequest request = new ArtifactResolutionRequest()
.setArtifact(projectArtifact)
@@ -416,12 +320,12 @@
public void calculateConcreteState(MavenProject project, ProjectBuilderConfiguration config)
throws ModelInterpolationException {
- new MavenProjectRestorer(pathTranslator, modelInterpolator, getLogger()).calculateConcreteState(project, config);
+ // new MavenProjectRestorer(pathTranslator, modelInterpolator, getLogger()).calculateConcreteState(project, config);
}
public void restoreDynamicState(MavenProject project, ProjectBuilderConfiguration config)
throws ModelInterpolationException {
- new MavenProjectRestorer(pathTranslator, modelInterpolator, getLogger()).restoreDynamicState(project, config);
+ // new MavenProjectRestorer(pathTranslator, modelInterpolator, getLogger()).restoreDynamicState(project, config);
}
public void enableLogging(Logger logger) {
@@ -539,287 +443,4 @@
return ArtifactUtils.versionlessKey(gid, aid);
}
-
- // jvz:note
- // We've got a mixture of things going in the USD and from the repository, sometimes the descriptor
- // is a real file and sometimes null which makes things confusing.
- /*
- private MavenProject buildInternal(Model model,
- ProjectBuilderConfiguration config,
- List parentSearchRepositories,
- File projectDescriptor,
- boolean strict,
- boolean isReactorProject,
- boolean fromSourceTree)
- throws ProjectBuildingException {
-
- MavenProject superProject = null;
- try {
- superProject = new MavenProject(getSuperModel(), artifactFactory, mavenTools, repositoryHelper);
- } catch (InvalidRepositoryException e) {
- throw new ProjectBuildingException(STANDALONE_SUPERPOM_GROUPID + ":"
- + STANDALONE_SUPERPOM_ARTIFACTID,
- "Maven super-POM contains an invalid repository!",
- e);
- }
-
- String projectId = safeVersionlessKey(model.getGroupId(), model.getArtifactId());
-
- // FIXME: Find a way to pass in this context, so it's never null!
- ProfileActivationContext profileActivationContext;
-
- ProfileManager externalProfileManager = config.getGlobalProfileManager();
- if (externalProfileManager != null) {
- // used to trigger the caching of SystemProperties in the container context...
- try {
- externalProfileManager.getActiveProfiles();
- }
- catch (ProfileActivationException e) {
- throw new ProjectBuildingException(projectId, "Failed to activate external profiles.", projectDescriptor, e);
- }
-
- profileActivationContext = externalProfileManager.getProfileActivationContext();
- } else {
- profileActivationContext = new DefaultProfileActivationContext(config.getExecutionProperties(), false);
- }
-
- List activated = profileAdvisor.applyActivatedProfiles(getSuperModel(), projectDescriptor, isReactorProject, profileActivationContext);
- superProject.setActiveProfiles(activated);
-
- //noinspection CollectionDeclaredAsConcreteClass
- LinkedList lineage = new LinkedList();
-
- LinkedHashSet aggregatedRemoteWagonRepositories = repositoryHelper.collectInitialRepositories(model, getSuperModel(),
- parentSearchRepositories,
- projectDescriptor,
- isReactorProject,
- profileActivationContext);
-
- Model originalModel = ModelUtils.cloneModel(model);
-
- MavenProject project;
-
- try {
- project = assembleLineage(model, lineage, config, projectDescriptor, aggregatedRemoteWagonRepositories, strict, isReactorProject);
- }
- catch (InvalidRepositoryException e) {
- throw new ProjectBuildingException(projectId, e.getMessage(), e);
- }
-
- project.setOriginalModel(originalModel);
-
- // we don't have to force the collision exception for superModel here, it's already been done in getSuperModel()
- MavenProject previousProject = superProject;
-
- Model previous = superProject.getModel();
-
- for (Iterator i = lineage.iterator(); i.hasNext();) {
- MavenProject currentProject = (MavenProject) i.next();
-
- Model current = currentProject.getModel();
-
- String pathAdjustment = null;
-
- try {
- pathAdjustment = previousProject.getModulePathAdjustment(currentProject);
- }
- catch (IOException e) {
- getLogger().debug(
- "Cannot determine whether " + currentProject.getId() + " is a module of " + previousProject.getId() + ". Reason: " + e.getMessage(),
- e);
- }
-
- modelInheritanceAssembler.assembleModelInheritance(current, previous, pathAdjustment);
-
- previous = current;
- previousProject = currentProject;
- }
-
- try {
- project = processProjectLogic(project, projectDescriptor, config);
- }
- catch (ModelInterpolationException e) {
- throw new InvalidProjectModelException(projectId, e.getMessage(), projectDescriptor, e);
- }
- catch (InvalidRepositoryException e) {
- throw new InvalidProjectModelException(projectId, e.getMessage(), projectDescriptor, e);
- }
-
- if (fromSourceTree) {
- project.setFile(projectDescriptor);
- }
- return project;
- }
- */
- /**
- * @todo can this take in a model instead of a project and still be successful?
- * @todo In fact, does project REALLY need a MavenProject as a parent? Couldn't it have just a wrapper around a
- * model that supported parents which were also the wrapper so that inheritence was assembled. We don't really need
- * the resolved source roots, etc for the parent - that occurs for the parent when it is constructed independently
- * and projects are not cached or reused
- */
- /*
- private MavenProject processProjectLogic(MavenProject project,
- File pomFile,
- ProjectBuilderConfiguration config
- )
- throws ProjectBuildingException, ModelInterpolationException, InvalidRepositoryException {
- Model model = project.getModel();
-
- List activeProfiles = project.getActiveProfiles();
-
- File projectDir = null;
-
- if (pomFile != null) {
- projectDir = pomFile.getAbsoluteFile().getParentFile();
- }
-
- Build dynamicBuild = model.getBuild();
- model.setBuild(ModelUtils.cloneBuild(dynamicBuild));
-
- model = modelInterpolator.interpolate(model, projectDir, config, getLogger().isDebugEnabled());
-
- mergeDeterministicBuildElements(model.getBuild(), dynamicBuild);
- model.setBuild(dynamicBuild);
-
- // interpolation is before injection, because interpolation is off-limits in the injected variables
- modelDefaultsInjector.injectDefaults(model);
-
- MavenProject parentProject = project.getParent();
-
- Model originalModel = project.getOriginalModel();
-
- Artifact parentArtifact = project.getParentArtifact();
-
- // We will return a different project object using the new model (hence the need to return a project, not just modify the parameter)
- project = new MavenProject(model, artifactFactory, mavenTools, repositoryHelper);
-
- project.setOriginalModel(originalModel);
-
- project.setActiveProfiles(activeProfiles);
-
- // TODO: such a call in MavenMetadataSource too - packaging not really the intention of type
- // TODO: maybe not strictly correct, while we should enfore that packaging has a type handler of the same id, we don't
- Artifact projectArtifact = artifactFactory.createBuildArtifact(project.getGroupId(), project.getArtifactId(),
- project.getVersion(), project.getPackaging());
- project.setArtifact(projectArtifact);
- project.setParent(parentProject);
-
- if (parentProject != null) {
- project.setParentArtifact(parentArtifact);
- }
-
- validateModel(model, pomFile);
- return project;
- }
-
- // TODO: Remove this!
- @SuppressWarnings("unchecked")
- private void mergeDeterministicBuildElements(Build interpolatedBuild,
- Build dynamicBuild) {
- List<Plugin> dPlugins = dynamicBuild.getPlugins();
-
- if (dPlugins != null) {
- List<Plugin> iPlugins = interpolatedBuild.getPlugins();
-
- for (int i = 0; i < dPlugins.size(); i++) {
- Plugin dPlugin = dPlugins.get(i);
- Plugin iPlugin = iPlugins.get(i);
-
- dPlugin.setGroupId(iPlugin.getGroupId());
- dPlugin.setArtifactId(iPlugin.getArtifactId());
- dPlugin.setVersion(iPlugin.getVersion());
-
- dPlugin.setDependencies(iPlugin.getDependencies());
- }
- }
-
- PluginManagement dPluginMgmt = dynamicBuild.getPluginManagement();
-
- if (dPluginMgmt != null) {
- PluginManagement iPluginMgmt = interpolatedBuild.getPluginManagement();
- dPlugins = dPluginMgmt.getPlugins();
- if (dPlugins != null) {
- List<Plugin> iPlugins = iPluginMgmt.getPlugins();
-
- for (int i = 0; i < dPlugins.size(); i++) {
- Plugin dPlugin = dPlugins.get(i);
- Plugin iPlugin = iPlugins.get(i);
-
- dPlugin.setGroupId(iPlugin.getGroupId());
- dPlugin.setArtifactId(iPlugin.getArtifactId());
- dPlugin.setVersion(iPlugin.getVersion());
-
- dPlugin.setDependencies(iPlugin.getDependencies());
- }
- }
- }
-
- if (dynamicBuild.getExtensions() != null) {
- dynamicBuild.setExtensions(interpolatedBuild.getExtensions());
- }
- }
-
-
- private MavenProject assembleLineage(Model model,
- LinkedList lineage,
- ProjectBuilderConfiguration config,
- File pomFile,
- Set aggregatedRemoteWagonRepositories,
- boolean strict,
- boolean isReactorProject)
- throws ProjectBuildingException, InvalidRepositoryException {
- ModelLineage modelLineage = new DefaultModelLineage();
-
- modelLineage.setOrigin(model, pomFile, new ArrayList(aggregatedRemoteWagonRepositories), isReactorProject);
-
- modelLineageBuilder.resumeBuildingModelLineage(modelLineage, config, !strict, isReactorProject);
-
- // FIXME: Find a way to pass in this context, so it's never null!
- ProfileActivationContext profileActivationContext;
- ProfileManager externalProfileManager = config.getGlobalProfileManager();
-
- if (externalProfileManager != null) {
- profileActivationContext = externalProfileManager.getProfileActivationContext();
- } else {
- profileActivationContext = new DefaultProfileActivationContext(config.getExecutionProperties(), false);
- }
-
- MavenProject lastProject = null;
- for (ModelLineageIterator it = modelLineage.lineageIterator(); it.hasNext();) {
- Model currentModel = (Model) it.next();
-
- File currentPom = it.getPOMFile();
-
- MavenProject project = new MavenProject(currentModel, artifactFactory, mavenTools, repositoryHelper);
- project.setFile(currentPom);
-
- if (lastProject != null) {
- // TODO: Use cached parent project here, and stop looping, if possible...
- lastProject.setParent(project);
- project = lastProject.getParent();
-
- lastProject.setParentArtifact(artifactFactory.createParentArtifact(project.getGroupId(), project
- .getArtifactId(), project.getVersion()));
- }
-
- // NOTE: the caching aspect may replace the parent project instance, so we apply profiles here.
- // TODO: Review this...is that a good idea, to allow application of profiles when other profiles could have been applied already?
- project.setActiveProfiles(profileAdvisor.applyActivatedProfiles(project.getModel(), project.getFile(), isReactorProject, profileActivationContext));
-
- lineage.addFirst(project);
-
- lastProject = project;
- }
-
- MavenProject result = (MavenProject) lineage.getLast();
-
- if (externalProfileManager != null) {
- profileAdvisor.applyActivatedExternalProfiles(result.getModel(), pomFile, externalProfileManager);
- }
-
- return result;
- }
- */
-
}
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java?rev=686890&r1=686889&r2=686890&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java Mon Aug 18 15:54:01 2008
@@ -1,7 +1,6 @@
package org.apache.maven.project;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.profiles.ProfileManager;
import java.util.Date;
import java.util.Properties;
@@ -10,8 +9,6 @@
implements ProjectBuilderConfiguration
{
- private ProfileManager globalProfileManager;
-
private ArtifactRepository localRepository;
private Properties userProperties;
@@ -24,17 +21,6 @@
{
}
- public ProjectBuilderConfiguration setGlobalProfileManager( ProfileManager globalProfileManager )
- {
- this.globalProfileManager = globalProfileManager;
- return this;
- }
-
- public ProfileManager getGlobalProfileManager()
- {
- return globalProfileManager;
- }
-
public ProjectBuilderConfiguration setLocalRepository( ArtifactRepository localRepository )
{
this.localRepository = localRepository;
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=686890&r1=686889&r2=686890&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/MavenProject.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/MavenProject.java Mon Aug 18 15:54:01 2008
@@ -19,25 +19,21 @@
* under the License.
*/
+import org.apache.maven.MavenTools;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.DependencyResolutionRequiredException;
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.resolver.filter.ExcludesArtifactFilter;
+import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.artifact.versioning.ManagedVersionMap;
import org.apache.maven.artifact.versioning.VersionRange;
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.model.*;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
-import org.apache.maven.project.artifact.ActiveProjectArtifact;
-import org.apache.maven.project.artifact.InvalidDependencyVersionException;
-import org.apache.maven.project.artifact.MavenMetadataSource;
-import org.apache.maven.MavenTools;
-import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.xml.Xpp3Dom;
import java.io.File;
import java.io.IOException;
@@ -135,8 +131,6 @@
private MavenTools mavenTools;
- private RepositoryHelper repositoryHelper;
-
public MavenProject()
{
Model model = new Model();
@@ -153,7 +147,7 @@
setModel( model );
}
- public MavenProject(Model model, ArtifactFactory artifactFactory, MavenTools mavenTools, RepositoryHelper repositoryHelper)
+ public MavenProject(Model model, ArtifactFactory artifactFactory, MavenTools mavenTools)
throws InvalidRepositoryException {
if(model == null)
{
@@ -166,7 +160,6 @@
setModel( model );
this.artifactFactory = artifactFactory;
this.mavenTools = mavenTools;
- this.repositoryHelper = repositoryHelper;
DistributionManagement dm = model.getDistributionManagement();
@@ -288,11 +281,11 @@
setScriptSourceRoots( ( new ArrayList( project.getScriptSourceRoots() ) ) );
}
- setModel( ( ModelUtils.cloneModel( project.getModel() ) ) );
+ // setModel( ( ModelUtils.cloneModel( project.getModel() ) ) );
if ( project.getOriginalModel() != null )
{
- setOriginalModel( ( ModelUtils.cloneModel( project.getOriginalModel() ) ) );
+ // setOriginalModel( ( ModelUtils.cloneModel( project.getOriginalModel() ) ) );
}
setExecutionRoot( project.isExecutionRoot() );
@@ -319,8 +312,8 @@
if ( project.isConcrete() )
{
- setDynamicBuild( ModelUtils.cloneBuild( project.getDynamicBuild() ) );
- setOriginalInterpolatedBuild( ModelUtils.cloneBuild( project.getOriginalInterpolatedBuild() ) );
+ // setDynamicBuild( ModelUtils.cloneBuild( project.getDynamicBuild() ) );
+ // setOriginalInterpolatedBuild( ModelUtils.cloneBuild( project.getOriginalInterpolatedBuild() ) );
List dynamicRoots = project.getDynamicCompileSourceRoots();
if ( dynamicRoots != null )
@@ -1460,7 +1453,7 @@
{
Plugin pmPlugin = (Plugin) pmByKey.get( pluginKey );
- ModelUtils.mergePluginDefinitions( plugin, pmPlugin, false );
+ //ModelUtils.mergePluginDefinitions( plugin, pmPlugin, false );
}
}
}
@@ -1808,18 +1801,6 @@
}
}
- /**
- * @todo the lazy initialisation of this makes me uneasy.
- * @return {@link Set} < {@link Artifact} >
- */
- public Set createArtifacts( ArtifactFactory artifactFactory, String inheritedScope,
- ArtifactFilter dependencyFilter )
- throws InvalidDependencyVersionException
- {
- return MavenMetadataSource.createArtifacts( artifactFactory, getDependencies(), inheritedScope,
- dependencyFilter, this );
- }
-
public void addProjectReference( MavenProject project )
{
projectReferences.put( getProjectReferenceId( project.getGroupId(), project.getArtifactId(), project.getVersion() ), project );
@@ -1904,92 +1885,6 @@
return snapshotArtifactRepository;
}
- public Artifact replaceWithActiveArtifact( Artifact pluginArtifact )
- {
- if ( ( getProjectReferences() != null ) && !getProjectReferences().isEmpty() )
- {
- String refId = getProjectReferenceId( pluginArtifact.getGroupId(), pluginArtifact.getArtifactId(), pluginArtifact.getVersion() );
- MavenProject ref = (MavenProject) getProjectReferences().get( refId );
- if ( ( ref != null ) && ( ref.getArtifact() != null ) )
- {
- // TODO: if not matching, we should get the correct artifact from that project (attached)
- if ( ref.getArtifact().getDependencyConflictId().equals( pluginArtifact.getDependencyConflictId() ) )
- {
- // if the project artifact doesn't exist, don't use it. We haven't built that far.
- if ( ( ref.getArtifact().getFile() != null ) && ref.getArtifact().getFile().exists() )
- {
- // FIXME: Why aren't we using project.getArtifact() for the second parameter here??
- pluginArtifact = new ActiveProjectArtifact( ref, pluginArtifact );
- return pluginArtifact;
- }
- else
- {
-/* TODO...
- logger.warn( "Artifact found in the reactor has not been built when it's use was " +
- "attempted - resolving from the repository instead" );
-*/
- }
- }
-
- Iterator itr = ref.getAttachedArtifacts().iterator();
- while(itr.hasNext()) {
- Artifact attached = (Artifact) itr.next();
- if( attached.getDependencyConflictId().equals(pluginArtifact.getDependencyConflictId()) ) {
- /* TODO: if I use the original, I get an exception below:
- java.lang.UnsupportedOperationException: Cannot change the download information for an attached artifact. It is derived from the main artifact.
- at org.apache.maven.project.artifact.AttachedArtifact.setDownloadUrl(AttachedArtifact.java:89)
- at org.apache.maven.project.artifact.MavenMetadataSource.retrieve(MavenMetadataSource.java:205)
- at org.apache.maven.artifact.resolver.DefaultArtifactCollector.recurse(DefaultArtifactCollector.java:275)
- at org.apache.maven.artifact.resolver.DefaultArtifactCollector.collect(DefaultArtifactCollector.java:67)
- at org.apache.maven.artifact.resolver.DefaultArtifactResolver.resolveTransitively(DefaultArtifactResolver.java:223)
- at org.apache.maven.artifact.resolver.DefaultArtifactResolver.resolveTransitively(DefaultArtifactResolver.java:211)
- at org.apache.maven.artifact.resolver.DefaultArtifactResolver.resolveTransitively(DefaultArtifactResolver.java:182)
- at org.apache.maven.plugin.DefaultPluginManager.resolveTransitiveDependencies(DefaultPluginManager.java:1117)
- at org.apache.maven.plugin.DefaultPluginManager.executeMojo(DefaultPluginManager.java:366)
- at org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoals(DefaultLifecycleExecutor.java:534)
- at org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalWithLifecycle(DefaultLifecycleExecutor.java:475)
- at org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoal(DefaultLifecycleExecutor.java:454)
- at org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalAndHandleFailures(DefaultLifecycleExecutor.java:306)
- at org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeTaskSegments(DefaultLifecycleExecutor.java:273)
- at org.apache.maven.lifecycle.DefaultLifecycleExecutor.execute(DefaultLifecycleExecutor.java:140)
- at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:322)
- at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:115)
- at org.apache.maven.cli.MavenCli.main(MavenCli.java:256)
- */
- Artifact resultArtifact=ArtifactUtils.copyArtifact(attached);
- resultArtifact.setScope(pluginArtifact.getScope());
- return resultArtifact;
- }
- }
-
- /**
- * Patch/workaround for: MNG-2871
- *
- * We want to use orginal artifact (packaging:ejb) when we are
- * resolving ejb-client package and we didn't manage to find
- * attached to project one.
- *
- * The scenario is such that somebody run "mvn test" in composity project,
- * and ejb-client.jar will not be attached to ejb.jar (because it is done in package phase)
- *
- * We prefer in such a case use orginal sources (of ejb.jar) instead of failure
- */
- if ( ( ref.getArtifactId().equals( pluginArtifact.getArtifactId() ) ) &&
- ( ref.getGroupId().equals( pluginArtifact.getGroupId() ) ) &&
- ( ref.getArtifact().getType().equals( "ejb" ) ) &&
- ( pluginArtifact.getType().equals( "ejb-client" ) ) &&
- ( ( ref.getArtifact().getFile() != null ) && ref.getArtifact().getFile().exists() ) )
- {
- pluginArtifact = new ActiveProjectArtifact(
- ref,
- pluginArtifact );
- return pluginArtifact;
- }
- }
- }
- return pluginArtifact;
- }
-
private void addArtifactPath(Artifact a, List list) throws DependencyResolutionRequiredException
{
String refId = getProjectReferenceId( a.getGroupId(), a.getArtifactId(), a.getVersion() );
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java?rev=686890&r1=686889&r2=686890&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java Mon Aug 18 15:54:01 2008
@@ -21,7 +21,6 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.project.interpolation.ModelInterpolationException;
import java.io.File;
@@ -39,65 +38,19 @@
boolean STRICT_MODEL_PARSING = true;
- /**
- * @deprecated Use {@link MavenProjectBuilder#build(File, ProjectBuilderConfiguration)} instead.
- */
- @Deprecated
- MavenProject build( File project,
- ArtifactRepository localRepository,
- ProfileManager globalProfileManager )
- throws ProjectBuildingException;
-
MavenProject build( File project, ProjectBuilderConfiguration configuration )
throws ProjectBuildingException;
- MavenProject buildWithDependencies( File project,
- ArtifactRepository localRepository,
- ProfileManager globalProfileManager )
- throws ProjectBuildingException;
-
MavenProjectBuildingResult buildProjectWithDependencies( File project,
ProjectBuilderConfiguration config )
throws ProjectBuildingException;
- /**
- * @deprecated Use {@link MavenProjectBuilder#buildProjectWithDependencies(File, ProjectBuilderConfiguration)} instead.
- */
- @Deprecated
- MavenProjectBuildingResult buildProjectWithDependencies( File project,
- ArtifactRepository localRepository,
- ProfileManager globalProfileManager )
- throws ProjectBuildingException;
-
-
MavenProject buildFromRepository( Artifact artifact,
List remoteArtifactRepositories,
ArtifactRepository localRepository )
throws ProjectBuildingException;
- /** @deprecated We do not want to allow projects to not have POMs. Maven 1.x repositories be damned. */
- @Deprecated
- MavenProject buildFromRepository( Artifact artifact,
- List remoteArtifactRepositories,
- ArtifactRepository localRepository,
- boolean allowStub )
- throws ProjectBuildingException;
-
- /**
- * @deprecated Use {@link MavenProjectBuilder#buildStandaloneSuperProject(ProjectBuilderConfiguration)} instead.
- */
- @Deprecated
- MavenProject buildStandaloneSuperProject()
- throws ProjectBuildingException;
-
- /**
- * @deprecated Use {@link MavenProjectBuilder#buildStandaloneSuperProject(ProjectBuilderConfiguration)} instead.
- */
- @Deprecated
- MavenProject buildStandaloneSuperProject( ProfileManager profileManager )
- throws ProjectBuildingException;
-
MavenProject buildStandaloneSuperProject( ProjectBuilderConfiguration config )
throws ProjectBuildingException;
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java?rev=686890&r1=686889&r2=686890&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java Mon Aug 18 15:54:01 2008
@@ -1,7 +1,6 @@
package org.apache.maven.project;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.profiles.ProfileManager;
import java.util.Date;
import java.util.Properties;
@@ -11,14 +10,10 @@
ArtifactRepository getLocalRepository();
- ProfileManager getGlobalProfileManager();
-
Properties getUserProperties();
Properties getExecutionProperties();
- ProjectBuilderConfiguration setGlobalProfileManager( ProfileManager globalProfileManager );
-
ProjectBuilderConfiguration setLocalRepository( ArtifactRepository localRepository );
ProjectBuilderConfiguration setUserProperties( Properties userProperties );
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/ProjectBuildingException.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/ProjectBuildingException.java?rev=686890&r1=686889&r2=686890&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/ProjectBuildingException.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/ProjectBuildingException.java Mon Aug 18 15:54:01 2008
@@ -4,8 +4,6 @@
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.profiles.activation.ProfileActivationException;
-import org.apache.maven.project.artifact.InvalidDependencyVersionException;
import org.apache.maven.project.interpolation.ModelInterpolationException;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -86,26 +84,6 @@
this.projectId = projectId;
this.pomFile = pomFile;
}
-
- /**
- * @deprecated use {@link File} constructor for pomLocation
- */
- public ProjectBuildingException( String projectId, String message, String pomLocation,
- ProfileActivationException cause )
- {
- super( message, cause );
- this.projectId = projectId;
- pomFile = new File( pomLocation );
- }
-
- public ProjectBuildingException( String projectId, String message, File pomFile,
- ProfileActivationException cause )
- {
- super( message, cause );
- this.projectId = projectId;
- this.pomFile = pomFile;
- }
-
/**
* @deprecated use {@link File} constructor for pomLocation
*/
@@ -234,24 +212,6 @@
pomFile = new File( pomLocation );
}
- public ProjectBuildingException( String projectId, String message, File pomFile,
- InvalidDependencyVersionException cause )
- {
- super( message, cause );
- this.projectId = projectId;
- this.pomFile = pomFile;
- }
-
- /**
- * @deprecated use {@link File} constructor for pomLocation
- */
- public ProjectBuildingException( String projectId, String message, String pomLocation,
- InvalidDependencyVersionException cause )
- {
- super( message, cause );
- this.projectId = projectId;
- pomFile = new File( pomLocation );
- }
protected ProjectBuildingException( String projectId, String message, File pomFile,
ModelInterpolationException cause )
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java?rev=686890&r1=686889&r2=686890&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java Mon Aug 18 15:54:01 2008
@@ -24,11 +24,7 @@
import org.apache.maven.shared.model.ModelContainerFactory;
import org.apache.maven.shared.model.ModelProperty;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
public final class ArtifactModelContainerFactory
implements ModelContainerFactory
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java?rev=686890&r1=686889&r2=686890&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java Mon Aug 18 15:54:01 2008
@@ -24,11 +24,7 @@
import org.apache.maven.shared.model.ModelContainerFactory;
import org.apache.maven.shared.model.ModelProperty;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
public class IdModelContainerFactory
implements ModelContainerFactory
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java?rev=686890&r1=686889&r2=686890&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java Mon Aug 18 15:54:01 2008
@@ -29,11 +29,7 @@
import org.codehaus.plexus.util.WriterFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Writer;
+import java.io.*;
/**
* Provides a wrapper for the maven model.
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java?rev=686890&r1=686889&r2=686890&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java Mon Aug 18 15:54:01 2008
@@ -21,8 +21,8 @@
import org.apache.maven.model.Model;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.shared.model.InterpolatorProperty;
import org.apache.maven.shared.model.ImportModel;
+import org.apache.maven.shared.model.InterpolatorProperty;
import java.io.File;
import java.io.IOException;
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultImportModel.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultImportModel.java?rev=686890&r1=686889&r2=686890&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultImportModel.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultImportModel.java Mon Aug 18 15:54:01 2008
@@ -3,8 +3,8 @@
import org.apache.maven.shared.model.ImportModel;
import org.apache.maven.shared.model.ModelProperty;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
public final class DefaultImportModel implements ImportModel {
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java?rev=686890&r1=686889&r2=686890&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java Mon Aug 18 15:54:01 2008
@@ -19,26 +19,20 @@
* under the License.
*/
+import org.apache.maven.MavenTools;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.model.Model;
import org.apache.maven.model.Parent;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.RepositoryHelper;
-import org.apache.maven.project.builder.ArtifactModelContainerFactory;
-import org.apache.maven.project.builder.IdModelContainerFactory;
-import org.apache.maven.project.builder.PomArtifactResolver;
-import org.apache.maven.project.builder.PomClassicDomainModel;
-import org.apache.maven.project.builder.PomClassicTransformer;
-import org.apache.maven.project.builder.ProjectBuilder;
+import org.apache.maven.project.builder.*;
import org.apache.maven.project.validation.ModelValidationResult;
import org.apache.maven.project.validation.ModelValidator;
import org.apache.maven.shared.model.DomainModel;
+import org.apache.maven.shared.model.ImportModel;
import org.apache.maven.shared.model.InterpolatorProperty;
import org.apache.maven.shared.model.ModelTransformerContext;
-import org.apache.maven.shared.model.ImportModel;
-import org.apache.maven.MavenTools;
import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
@@ -46,11 +40,7 @@
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
/**
* Default implementation of the project builder.
@@ -70,8 +60,6 @@
private MavenTools mavenTools;
- private RepositoryHelper repositoryHelper;
-
/**
* Default constructor
*/
@@ -167,7 +155,7 @@
Model model = transformedDomainModel.getModel();
try {
- return new MavenProject( model, artifactFactory, mavenTools, repositoryHelper);
+ return new MavenProject( model, artifactFactory, mavenTools);
} catch (InvalidRepositoryException e) {
throw new IOException(e.getMessage());
}
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java?rev=686890&r1=686889&r2=686890&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java Mon Aug 18 15:54:01 2008
@@ -20,9 +20,7 @@
*/
import org.apache.maven.project.path.PathTranslator;
-import org.codehaus.plexus.interpolation.AbstractFunctionValueSourceWrapper;
import org.codehaus.plexus.interpolation.InterpolationPostProcessor;
-import org.codehaus.plexus.interpolation.ValueSource;
import java.io.File;
import java.util.List;
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java?rev=686890&r1=686889&r2=686890&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java Mon Aug 18 15:54:01 2008
@@ -25,15 +25,7 @@
import org.apache.maven.project.DefaultProjectBuilderConfiguration;
import org.apache.maven.project.ProjectBuilderConfiguration;
import org.apache.maven.project.path.PathTranslator;
-import org.codehaus.plexus.interpolation.InterpolationException;
-import org.codehaus.plexus.interpolation.MapBasedValueSource;
-import org.codehaus.plexus.interpolation.ObjectBasedValueSource;
-import org.codehaus.plexus.interpolation.PrefixAwareRecursionInterceptor;
-import org.codehaus.plexus.interpolation.PrefixedObjectValueSource;
-import org.codehaus.plexus.interpolation.PrefixedValueSourceWrapper;
-import org.codehaus.plexus.interpolation.RecursionInterceptor;
-import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
-import org.codehaus.plexus.interpolation.ValueSource;
+import org.codehaus.plexus.interpolation.*;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -42,12 +34,7 @@
import java.io.IOException;
import java.io.StringReader;
import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
+import java.util.*;
/**
* Use a regular expression search to find and resolve expressions within the POM.
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java?rev=686890&r1=686889&r2=686890&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java Mon Aug 18 15:54:01 2008
@@ -20,16 +20,7 @@
*/
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.model.Build;
-import org.apache.maven.model.Dependency;
-import org.apache.maven.model.DependencyManagement;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.Parent;
-import org.apache.maven.model.Plugin;
-import org.apache.maven.model.ReportPlugin;
-import org.apache.maven.model.Reporting;
-import org.apache.maven.model.Repository;
-import org.apache.maven.model.Resource;
+import org.apache.maven.model.*;
import org.codehaus.plexus.util.StringUtils;
import java.io.File;
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java?rev=686890&r1=686889&r2=686890&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java Mon Aug 18 15:54:01 2008
@@ -22,9 +22,6 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.DefaultArtifactRepository;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.apache.maven.profiles.DefaultProfileManager;
-import org.apache.maven.profiles.activation.DefaultProfileActivationContext;
-import org.apache.maven.profiles.activation.ProfileActivationContext;
import org.apache.maven.project.validation.ModelValidationResult;
import org.codehaus.plexus.PlexusTestCase;
@@ -134,7 +131,7 @@
throws Exception
{
Properties props = System.getProperties();
- ProfileActivationContext ctx = new DefaultProfileActivationContext( props, false );
+ // ProfileActivationContext ctx = new DefaultProfileActivationContext( props, false );
return projectBuilder.build( pom, getLocalRepository(), new DefaultProfileManager( getContainer(), ctx ) );
}
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectHelperTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectHelperTest.java?rev=686890&r1=686889&r2=686890&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectHelperTest.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectHelperTest.java Mon Aug 18 15:54:01 2008
@@ -11,19 +11,16 @@
extends PlexusTestCase
{
- private MavenProjectHelper mavenProjectHelper;
-
private ArtifactFactory artifactFactory;
public void setUp()
throws Exception
{
super.setUp();
-
- mavenProjectHelper = (MavenProjectHelper) lookup( MavenProjectHelper.ROLE );
artifactFactory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
}
+ /*
public void testShouldThrowExceptionWhenDuplicateAttachmentIsAdded()
{
Model model = new Model();
@@ -53,5 +50,5 @@
assertSame( project, e.getProject() );
}
}
-
+ */
}
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/SuperPomProjectBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/SuperPomProjectBuilderTest.java?rev=686890&r1=686889&r2=686890&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/SuperPomProjectBuilderTest.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/SuperPomProjectBuilderTest.java Mon Aug 18 15:54:01 2008
@@ -41,6 +41,7 @@
projectBuilder = (DefaultMavenProjectBuilder) lookup( MavenProjectBuilder.ROLE );
}
+ /*
public void testStandaloneSuperPomContainsInjectedExternalProfileRepositories()
throws Exception
{
@@ -76,7 +77,7 @@
assertArtifactRepository( "central", project.getRemoteArtifactRepositories() );
assertArtifactRepository( "central", project.getPluginArtifactRepositories() );
}
-
+ */
private void assertArtifactRepository( String id,
List repos )
{