Modified: maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java?rev=800158&r1=800157&r2=800158&view=diff ============================================================================== --- maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java (original) +++ maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java Sun Aug 2 23:28:55 2009 @@ -33,6 +33,7 @@ import org.apache.maven.artifact.resolver.ArtifactResolutionRequest; import org.apache.maven.artifact.resolver.ArtifactResolutionResult; import org.apache.maven.artifact.resolver.ResolutionErrorHandler; +import org.apache.maven.classrealm.ClassRealmManager; import org.apache.maven.model.Build; import org.apache.maven.model.Dependency; import org.apache.maven.model.Extension; @@ -40,17 +41,16 @@ import org.apache.maven.model.Plugin; import org.apache.maven.model.Repository; import org.apache.maven.repository.RepositorySystem; -import org.codehaus.plexus.MutablePlexusContainer; import org.codehaus.plexus.PlexusContainer; -import org.codehaus.plexus.classworlds.ClassWorld; import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.codehaus.plexus.classworlds.realm.DuplicateRealmException; import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Requirement; import org.codehaus.plexus.logging.Logger; /** - * Assists the project builder. + * Assists the project builder. <strong>Warning:</strong> This is an internal utility class 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 */ @@ -66,6 +66,9 @@ private PlexusContainer container; @Requirement + private ClassRealmManager classRealmManager; + + @Requirement private RepositorySystem repositorySystem; @Requirement @@ -125,32 +128,7 @@ return projectRealm; } - String realmId = model.getGroupId() + ':' + model.getArtifactId() + ':' + model.getVersion(); - - if ( logger.isDebugEnabled() ) - { - logger.debug( "Creating project realm " + realmId ); - } - - ClassWorld world = ( (MutablePlexusContainer) container ).getClassWorld(); - - synchronized ( world ) - { - projectRealm = world.getClassRealm( realmId ); - - if ( projectRealm == null ) - { - try - { - projectRealm = world.newRealm( realmId ); - projectRealm.setParentRealm( container.getContainerRealm() ); - } - catch ( DuplicateRealmException e ) - { - throw new IllegalStateException( "Failed to create project realm " + realmId, e ); - } - } - } + projectRealm = classRealmManager.createProjectRealm( model ); for ( Extension extension : build.getExtensions() ) { @@ -180,7 +158,8 @@ } catch ( Exception e ) { - throw new IllegalStateException( "Failed to discover components in project realm " + realmId, e ); + throw new IllegalStateException( "Failed to discover components in project realm " + projectRealm.getId(), + e ); } return projectRealm;
Propchange: maven/components/branches/MNG-4162/maven-core/src/main/mdo/toolchains.mdo ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 2 23:28:55 2009 @@ -1 +1,2 @@ /maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.mdo:768778,768796 +/maven/components/trunk/maven-core/src/main/mdo/toolchains.mdo:799928-799938 Propchange: maven/components/branches/MNG-4162/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 2 23:28:55 2009 @@ -5,3 +5,4 @@ /maven/components/branches/sisbell-plugin-manager/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTest.java:738973-739966 /maven/components/sisbell-plugin-manager/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTest.java:738757-738972 /maven/components/trunk/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTest.java:688587-696625,696644-699681 +/maven/components/trunk/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java:799928-799938 Propchange: maven/components/branches/MNG-4162/maven-core/src/test/java/org/apache/maven/profiles/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 2 23:28:55 2009 @@ -4,4 +4,5 @@ /maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/profiles:739385,741841,747468,747683,748815,749612,766523,768817 /maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/profiles:738973-739966 /maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/profiles:738757-738972 +/maven/components/trunk/maven-core/src/test/java/org/apache/maven/profiles:799928-799938 /maven/components/trunk/maven-project/src/test/java/org/apache/maven/profiles:751453-767358,767708-768832 Propchange: maven/components/branches/MNG-4162/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 2 23:28:55 2009 @@ -4,4 +4,5 @@ /maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java:739385,741841,747468,747683,748815,749612,766523,768817 /maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java:738973-739966 /maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java:738757-738972 +/maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java:799928-799938 /maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java:751453-767358,767708-768832 Propchange: maven/components/branches/MNG-4162/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 2 23:28:55 2009 @@ -4,4 +4,5 @@ /maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java:739385,741841,747468,747683,748815,749612,766523,768817 /maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java:738973-739966 /maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java:738757-738972 +/maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java:799928-799938 /maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java:751453-767358,767708-768832 Propchange: maven/components/branches/MNG-4162/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 2 23:28:55 2009 @@ -4,4 +4,5 @@ /maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java:739385,741841,747468,747683,748815,749612,766523,768817 /maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java:738973-739966 /maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java:738757-738972 +/maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java:799928-799938 /maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java:751453-767358,767708-768832 Propchange: maven/components/branches/MNG-4162/maven-core/src/test/java/org/apache/maven/project/ModelUtilsTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 2 23:28:55 2009 @@ -4,4 +4,5 @@ /maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/ModelUtilsTest.java:739385,741841,747468,747683,748815,749612,766523,768817 /maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/ModelUtilsTest.java:738973-739966 /maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/ModelUtilsTest.java:738757-738972 +/maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/ModelUtilsTest.java:799928-799938 /maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ModelUtilsTest.java:751453-767358,767708-768832 Propchange: maven/components/branches/MNG-4162/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 2 23:28:55 2009 @@ -4,4 +4,5 @@ /maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java:739385,741841,747468,747683,748815,749612,766523,768817 /maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java:738973-739966 /maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java:738757-738972 +/maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java:799928-799938 /maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java:751453-767358,767708-768832 Propchange: maven/components/branches/MNG-4162/maven-core/src/test/java/org/apache/maven/project/ProjectClasspathTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 2 23:28:55 2009 @@ -4,4 +4,5 @@ /maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java:739385,741841,747468,747683,748815,749612,766523,768817 /maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java:738973-739966 /maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java:738757-738972 +/maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/ProjectClasspathTest.java:799928-799938 /maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java:751453-767358,767708-768832 Propchange: maven/components/branches/MNG-4162/maven-core/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 2 23:28:55 2009 @@ -4,4 +4,5 @@ /maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java:739385,741841,747468,747683,748815,749612,766523,768817 /maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java:738973-739966 /maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java:738757-738972 +/maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java:799928-799938 /maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java:751453-767358,767708-768832 Propchange: maven/components/branches/MNG-4162/maven-core/src/test/java/org/apache/maven/project/artifact/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 2 23:28:55 2009 @@ -4,4 +4,5 @@ /maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/artifact:739385,741841,747468,747683,748815,749612,766523,768817 /maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/artifact:738973-739966 /maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/artifact:738757-738972 +/maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/artifact:799928-799938 /maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/artifact:751453-767358,767708-768832 Propchange: maven/components/branches/MNG-4162/maven-core/src/test/java/org/apache/maven/project/canonical/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 2 23:28:55 2009 @@ -4,4 +4,5 @@ /maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/canonical:739385,741841,747468,747683,748815,749612,766523,768817 /maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/canonical:738973-739966 /maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/canonical:738757-738972 +/maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/canonical:799928-799938 /maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/canonical:751453-767358,767708-768832 Propchange: maven/components/branches/MNG-4162/maven-core/src/test/java/org/apache/maven/project/inheritance/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 2 23:28:55 2009 @@ -4,4 +4,5 @@ /maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/inheritance:739385,741841,747468,747683,748815,749612,766523,768817 /maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/inheritance:738973-739966 /maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/inheritance:738757-738972 +/maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/inheritance:799928-799938 /maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance:751453-767358,767708-768832 Propchange: maven/components/branches/MNG-4162/maven-core/src/test/java/org/apache/maven/projectp ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 2 23:28:55 2009 @@ -4,4 +4,5 @@ /maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/ProjectBuilderURITest.java:739385,741841,747468,747683,748815,749612,766523,768817 /maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/ProjectBuilderURITest.java:738973-739966 /maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/ProjectBuilderURITest.java:738757-738972 +/maven/components/trunk/maven-core/src/test/java/org/apache/maven/projectp:799928-799938 /maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectBuilderURITest.java:751453-767358,767708-768832 Modified: maven/components/branches/MNG-4162/maven-embedder/src/main/java/org/apache/maven/cli/CLIRequestUtils.java URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4162/maven-embedder/src/main/java/org/apache/maven/cli/CLIRequestUtils.java?rev=800158&r1=800157&r2=800158&view=diff ============================================================================== --- maven/components/branches/MNG-4162/maven-embedder/src/main/java/org/apache/maven/cli/CLIRequestUtils.java (original) +++ maven/components/branches/MNG-4162/maven-embedder/src/main/java/org/apache/maven/cli/CLIRequestUtils.java Sun Aug 2 23:28:55 2009 @@ -37,7 +37,7 @@ import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.cli.CommandLineUtils; -public final class CLIRequestUtils +final class CLIRequestUtils { private CLIRequestUtils() Propchange: maven/components/branches/MNG-4162/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 2 23:28:55 2009 @@ -3,5 +3,5 @@ /maven/components/branches/maven-2.0.x/maven-embedder/src/main/java/org/apache/maven/embedder/user/SettingsAdapter.java:679206 /maven/components/branches/sisbell-plugin-manager/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java:738973-739966 /maven/components/sisbell-plugin-manager/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java:738757-738972 -/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java:751453-767358,767708-768832 +/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java:751453-767358,767708-768832,799928-799938 /maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/user/SettingsAdapter.java:688587-696625,696644-699681 Propchange: maven/components/branches/MNG-4162/maven-model-builder/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 2 23:28:55 2009 @@ -4,5 +4,5 @@ /maven/components/branches/maven-2.1.x/maven-project-builder:739385,741841,747468,747683,748815,749612 /maven/components/branches/sisbell-plugin-manager/maven-project-builder:738973-739966 /maven/components/sisbell-plugin-manager/maven-project-builder:738757-738972 -/maven/components/trunk/maven-model-builder:767708-768832 +/maven/components/trunk/maven-model-builder:767708-768832,799928-799938 /maven/components/trunk/maven-project-builder:688587-696625,696644-699681 Propchange: maven/components/branches/MNG-4162/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelEventListener.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 2 23:28:55 2009 @@ -5,4 +5,5 @@ /maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelEventListener.java:738973-739966 /maven/components/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelEventListener.java:738757-738972 /maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java:768840-768841 +/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelEventListener.java:799928-799938 /maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelEventListener.java:688587-696625,696644-699681 Propchange: maven/components/branches/MNG-4162/maven-model-builder/src/main/java/org/apache/maven/model/path/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 2 23:28:55 2009 @@ -4,4 +4,5 @@ /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/project/path:738973-739966 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/project/path:738757-738972 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/path:751453-767358,767708-768832 +/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/path:799928-799938 /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/path:688587-696625,696644-699681 Propchange: maven/components/branches/MNG-4162/maven-model-builder/src/main/mdo/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 2 23:28:55 2009 @@ -3,4 +3,4 @@ /maven/components/branches/maven-2.0.x/maven-profile/src/main/mdo:679206 /maven/components/branches/sisbell-plugin-manager/maven-project/src/main/mdo:738973-739966 /maven/components/sisbell-plugin-manager/maven-project/src/main/mdo:738757-738972 -/maven/components/trunk/maven-model-builder/src/main/mdo:767708-768832 +/maven/components/trunk/maven-model-builder/src/main/mdo:767708-768832,799928-799938 Propchange: maven/components/branches/MNG-4162/maven-model-builder/src/main/resources/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 2 23:28:55 2009 @@ -3,5 +3,5 @@ /maven/components/branches/maven-2.0.x/maven-project/src/main/resources:679206,720042 /maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/main/resources:738973-739966 /maven/components/sisbell-plugin-manager/maven-project-builder/src/main/resources:738757-738972 -/maven/components/trunk/maven-model-builder/src/main/resources:767708-768832 +/maven/components/trunk/maven-model-builder/src/main/resources:767708-768832,799928-799938 /maven/components/trunk/maven-project/src/main/resources:688587-696625,696644-699681 Propchange: maven/components/branches/MNG-4162/maven-model-builder/src/test/java/org/apache/maven/model/validation/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 2 23:28:55 2009 @@ -4,4 +4,5 @@ /maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/validation:739385,741841,747468,747683,748815,749612,766523,768817 /maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/validation:738973-739966 /maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/validation:738757-738972 +/maven/components/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation:799928-799938 /maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/validation:751453-767358,767708-768832 Propchange: maven/components/branches/MNG-4162/maven-plugin-api/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 2 23:28:55 2009 @@ -5,3 +5,4 @@ /maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java:738973-739966 /maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java:738757-738972 /maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java:688587-696625,696644-699681 +/maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java:799928-799938
