maven-m2-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdca...@apache.org
Subject cvs commit: maven-components/maven-core/src/main/java/org/apache/maven/lifecycle DefaultLifecycleExecutor.java
Date Mon, 21 Mar 2005 08:18:34 GMT
jdcasey     2005/03/21 00:18:34

  Modified:    maven-artifact/src/main/java/org/apache/maven/artifact/installer
                        DefaultArtifactInstaller.java
               maven-core/src/test/java/org/apache/maven/project
                        ProjectClasspathArtifactResolver.java
               maven-core/src/test/java/org/apache/maven/plugin
                        PluginParameterExpressionEvaluatorTest.java
               maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar
                        JarDeployMojo.java
               maven-core/src/main/java/org/apache/maven/execution
                        MavenSession.java
               maven-artifact/src/main/java/org/apache/maven/artifact
                        AbstractArtifactComponent.java DefaultArtifact.java
                        Artifact.java
               maven-core/src/main/java/org/apache/maven/plugin
                        DefaultPluginManager.java
               maven-artifact/src/test/java/org/apache/maven/artifact/resolver
                        ArtifactResolverTest.java
               maven-core/src/test/java/org/apache/maven MavenTestCase.java
               maven-core/src/main/java/org/apache/maven/project
                        MavenProject.java DefaultMavenProjectBuilder.java
               maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy
                        DeployMojo.java AbstractDeployMojo.java
               maven-core/src/main/java/org/apache/maven/artifact/repository
                        ArtifactRepositoryFactory.java
                        DefaultArtifactRepositoryFactory.java
               maven-plugins/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb
                        EjbMojo.java
               maven-core/src/main/java/org/apache/maven DefaultMaven.java
               maven-artifact/src/test/java/org/apache/maven/artifact
                        ArtifactComponentTestCase.java
               maven-artifact/src/main/java/org/apache/maven/artifact/resolver
                        DefaultArtifactResolver.java
               maven-artifact/src/main/resources/META-INF/plexus
                        components.xml
               maven-core/src/main/java/org/apache/maven/cli MavenCli.java
               maven-artifact/src/main/java/org/apache/maven/artifact/handler/manager
                        ArtifactHandlerManager.java
                        DefaultArtifactHandlerManager.java
               maven-artifact/src/main/java/org/apache/maven/artifact/repository
                        ArtifactRepository.java
               maven-plugins/maven-pom-plugin/src/main/java/org/apache/maven/plugin/pom
                        PomDeployMojo.java
               maven-artifact/src/main/java/org/apache/maven/artifact/manager
                        DefaultWagonManager.java
               maven-core/src/main/java/org/apache/maven/lifecycle
                        DefaultLifecycleExecutor.java
  Added:       maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout
                        ArtifactRepositoryLayout.java
                        DefaultRepositoryLayout.java
                        AbstractArtifactRepositoryLayout.java
                        LegacyRepositoryLayout.java
                        ArtifactPathFormatException.java
  Log:
  CHANGES
  ------------------------
  
  o Factored the layout for a repository into a separate set of components in o.a.m.a.repository.layout
  
  o Added new DefaultRepositoryLayout that uses the repo layout in http://docs.codehaus.org/pages/viewpage.action?pageId=22230
(it is not used by default until we get the repo1 conversion done)
  
  o Added command-line switches to force legacy local-repo or new format (-a/-A, I know, but
try to find something that makes more sense!)
  
  o Added path formatting to the repository itself, which is now constructed with a ArtifactRepositoryLayout
instance (since layout should be tied to the repository)
  
  o Removed path formatting altogether from the DefaultArtifactHandlerManager.
  
  o Changed the AbstractArtifactBasedComponent (or whatever it's called) to use the repository
formatting in the path() and localPath() methods.
  
  o Moved the plugin repo construction (still intact as a hard-coded singleton list) into
the DefaultMavenProjectBuilder, where it will eventually build from POM info.
  
  o Added a new method to build an artifact repository for a <distributionManagement/>
section, if possible. This reduced the strain on mojos to construct an ArtifactRepository
on demand.
  
  o Refactored all *DeployMojo to use #project.distributionManagementArtifactRepository instead
of the #settings, #component..ArtifactRepositoryFactory, ... that it used to require. This
is a big simplifying step.
  
  o Removed remote artifact repository construction from DefaultMaven, and changed the MavenSession
to delegate to MavenProject for remoteArtifactRepositories, just as it does for pluginRepositories.
  
  o Added remoteArtifactRepositories, pluginArtifactRepositories, distributionManagementArtifactRepository
to MavenProject as a cache for the higher-level repos used throughout the system. This is
project info, so it belongs here.
  
  o Fixed all the tests in maven-core and maven-artifact which I broke. :)
  
  o Dropped what is probably a big format-bomb, since the Eclipse formatter doesn't really
handle 'throws Exception' wrapping the right way.
  
  o Added MavenProject to the MavenSession constructor, since there should always be a MavenProject
associated with a build, even if it's just the super-pom.
  
  TODO:
  --------------------------
  
  - Write an integration/unit test to ensure that the new repo format works with $classifier
(was: $extra) and $groupId[0]/../$groupId[n]. This is a simple adaptation of the old layout,
but still needs testing.
  
  Revision  Changes    Path
  1.4       +3 -2      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
  
  http://cvs.apache.org/viewcvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java.diff?r1=1.3&r2=1.4
  
  
  1.4       +9 -6      maven-components/maven-core/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java
  
  http://cvs.apache.org/viewcvs/maven-components/maven-core/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java.diff?r1=1.3&r2=1.4
  
  
  1.9       +24 -24    maven-components/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
  
  http://cvs.apache.org/viewcvs/maven-components/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java.diff?r1=1.8&r2=1.9
  
  
  1.7       +27 -22    maven-components/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarDeployMojo.java
  
  http://cvs.apache.org/viewcvs/maven-components/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarDeployMojo.java.diff?r1=1.6&r2=1.7
  
  
  1.11      +12 -20    maven-components/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
  
  http://cvs.apache.org/viewcvs/maven-components/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java.diff?r1=1.10&r2=1.11
  
  
  1.1                  maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java
  
  http://cvs.apache.org/viewcvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java?rev=1.1
  
  
  1.1                  maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java
  
  http://cvs.apache.org/viewcvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java?rev=1.1
  
  
  1.1                  maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/AbstractArtifactRepositoryLayout.java
  
  http://cvs.apache.org/viewcvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/AbstractArtifactRepositoryLayout.java?rev=1.1
  
  
  1.1                  maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java
  
  http://cvs.apache.org/viewcvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java?rev=1.1
  
  
  1.1                  maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactPathFormatException.java
  
  http://cvs.apache.org/viewcvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactPathFormatException.java?rev=1.1
  
  
  1.6       +11 -4     maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/AbstractArtifactComponent.java
  
  http://cvs.apache.org/viewcvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/AbstractArtifactComponent.java.diff?r1=1.5&r2=1.6
  
  
  1.12      +37 -10    maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
  
  http://cvs.apache.org/viewcvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java.diff?r1=1.11&r2=1.12
  
  
  1.4       +8 -1      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
  
  http://cvs.apache.org/viewcvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java.diff?r1=1.3&r2=1.4
  
  
  1.64      +26 -55    maven-components/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
  
  http://cvs.apache.org/viewcvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java.diff?r1=1.63&r2=1.64
  
  
  1.11      +18 -23    maven-components/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
  
  http://cvs.apache.org/viewcvs/maven-components/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java.diff?r1=1.10&r2=1.11
  
  
  1.19      +12 -10    maven-components/maven-core/src/test/java/org/apache/maven/MavenTestCase.java
  
  http://cvs.apache.org/viewcvs/maven-components/maven-core/src/test/java/org/apache/maven/MavenTestCase.java.diff?r1=1.18&r2=1.19
  
  
  1.32      +50 -15    maven-components/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
  
  http://cvs.apache.org/viewcvs/maven-components/maven-core/src/main/java/org/apache/maven/project/MavenProject.java.diff?r1=1.31&r2=1.32
  
  
  1.55      +129 -30   maven-components/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
  
  http://cvs.apache.org/viewcvs/maven-components/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java.diff?r1=1.54&r2=1.55
  
  
  1.4       +5 -13     maven-components/maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java
  
  http://cvs.apache.org/viewcvs/maven-components/maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java.diff?r1=1.3&r2=1.4
  
  
  1.10      +13 -38    maven-components/maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/AbstractDeployMojo.java
  
  http://cvs.apache.org/viewcvs/maven-components/maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/AbstractDeployMojo.java.diff?r1=1.9&r2=1.10
  
  
  1.3       +3 -1      maven-components/maven-core/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java
  
  http://cvs.apache.org/viewcvs/maven-components/maven-core/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java.diff?r1=1.2&r2=1.3
  
  
  1.3       +9 -5      maven-components/maven-core/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
  
  http://cvs.apache.org/viewcvs/maven-components/maven-core/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java.diff?r1=1.2&r2=1.3
  
  
  1.3       +14 -10    maven-components/maven-plugins/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
  
  http://cvs.apache.org/viewcvs/maven-components/maven-plugins/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java.diff?r1=1.2&r2=1.3
  
  
  1.43      +13 -33    maven-components/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
  
  http://cvs.apache.org/viewcvs/maven-components/maven-core/src/main/java/org/apache/maven/DefaultMaven.java.diff?r1=1.42&r2=1.43
  
  
  1.8       +46 -25    maven-components/maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactComponentTestCase.java
  
  http://cvs.apache.org/viewcvs/maven-components/maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactComponentTestCase.java.diff?r1=1.7&r2=1.8
  
  
  1.20      +30 -29    maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
  
  http://cvs.apache.org/viewcvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java.diff?r1=1.19&r2=1.20
  
  
  1.10      +18 -1     maven-components/maven-artifact/src/main/resources/META-INF/plexus/components.xml
  
  http://cvs.apache.org/viewcvs/maven-components/maven-artifact/src/main/resources/META-INF/plexus/components.xml.diff?r1=1.9&r2=1.10
  
  
  1.23      +85 -49    maven-components/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
  
  http://cvs.apache.org/viewcvs/maven-components/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java.diff?r1=1.22&r2=1.23
  
  
  1.3       +8 -11     maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/manager/ArtifactHandlerManager.java
  
  http://cvs.apache.org/viewcvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/manager/ArtifactHandlerManager.java.diff?r1=1.2&r2=1.3
  
  
  1.7       +28 -58    maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java
  
  http://cvs.apache.org/viewcvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java.diff?r1=1.6&r2=1.7
  
  
  1.6       +19 -4     maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
  
  http://cvs.apache.org/viewcvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java.diff?r1=1.5&r2=1.6
  
  
  1.9       +30 -42    maven-components/maven-plugins/maven-pom-plugin/src/main/java/org/apache/maven/plugin/pom/PomDeployMojo.java
  
  http://cvs.apache.org/viewcvs/maven-components/maven-plugins/maven-pom-plugin/src/main/java/org/apache/maven/plugin/pom/PomDeployMojo.java.diff?r1=1.8&r2=1.9
  
  
  1.15      +4 -2      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
  
  http://cvs.apache.org/viewcvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java.diff?r1=1.14&r2=1.15
  
  
  1.29      +9 -16     maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
  
  http://cvs.apache.org/viewcvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java.diff?r1=1.28&r2=1.29
  
  

Mime
View raw message