Commit Graph

320 Commits

Author SHA1 Message Date
Brett Leslie Porter f07d86f311 clean up artifact handler a little - fields are all final
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163645 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 06:51:16 +00:00
John Dennis Casey 52d4ebc8fe o Added artifact resolver test that uses the new repository layout.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163641 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 03:51:56 +00:00
John Dennis Casey eec84bb41e o Correcting violation to the conflictId: this shouldn't include $classifier, according to the documentation on the repository layout.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163639 13f79535-47bb-0310-9956-ffa450edef68
2005-03-21 08:45:44 +00:00
John Dennis Casey 590e952f02 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.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163638 13f79535-47bb-0310-9956-ffa450edef68
2005-03-21 08:18:34 +00:00
John Dennis Casey 10b55add40 o Created non-abstract base class for DefaultArtifactFactory to extend, called ArtifactConstructionSupport, which provides centralized means for constructing artifacts consistently without all the maven-core specific methods. These maven-core specifics not delegate to the generic methods provided in this new class.
o Adjusted the maven-archetype stuff to work with the new artifact creation/resolution/etc. methods in maven-artifact and maven-core.
o Removed all direct construction of DefaultArtifact and replaced with ArtifactConstructionSupport where it would have involved putting the DefaultArtifactFactory in the plexus.xml, and where the code doesn't need dependency-oriented methods.
o Archetype works now, using the example provided in plexus/plexus-site/src/site/apt/building-plexus-applications.apt


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163615 13f79535-47bb-0310-9956-ffa450edef68
2005-03-18 22:02:09 +00:00
Brett Leslie Porter 2628261b75 PR: MNG-207
fix scope issue in a conflict


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163587 13f79535-47bb-0310-9956-ffa450edef68
2005-03-17 00:17:26 +00:00
Brett Leslie Porter 38add00ed4 cleanup
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163570 13f79535-47bb-0310-9956-ffa450edef68
2005-03-16 01:43:09 +00:00
Brett Leslie Porter 5c1f5b1e57 PR: MNG-52
change type of maven plugins to "maven-plugin" instead of plugin.
This should allow other products to have different plugin types, if necessary.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163562 13f79535-47bb-0310-9956-ffa450edef68
2005-03-15 22:31:54 +00:00
John Dennis Casey 4d1ca8da33 o Removed AuthenticationInfoProvider stuff
o Added ArtifactRepositoryFactory stuff to construct with AuthenticationInfo if possible.
o Added UserModelBuilder stuff for componentizing UserModel construction.
  -> DefaultUserModelBuilder has a configuration point 'userModelPath' which can redirect where it reads user.xml from (${user.home} is substitutable here).
o Added warning message to deployment plugin when deployment repo has no authentication info available.
o Added warning message for repos with null <id/> (auth info cannot be assigned here).
o Added a couple of debug-level messages for aid in debugging repo- and userModel-related problems.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163558 13f79535-47bb-0310-9956-ffa450edef68
2005-03-15 21:41:06 +00:00
Trygve Laugstol a82bda0aac o Adding a Plexus service handler.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163555 13f79535-47bb-0310-9956-ffa450edef68
2005-03-15 07:35:18 +00:00
Brett Leslie Porter f9c6aa0f9d missed a commit
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163553 13f79535-47bb-0310-9956-ffa450edef68
2005-03-15 03:09:42 +00:00
Brett Leslie Porter ba06a10501 some clean up
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163552 13f79535-47bb-0310-9956-ffa450edef68
2005-03-15 02:50:58 +00:00
Jason van Zyl 105288fee4 o change the signature of the filter so that the filter has full access to
the artifact for basing decisions.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163550 13f79535-47bb-0310-9956-ffa450edef68
2005-03-14 07:24:23 +00:00
Brett Leslie Porter 8e9febb5d5 minor error handling improvement
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163537 13f79535-47bb-0310-9956-ffa450edef68
2005-03-12 19:42:51 +00:00
Emmanuel Venisse 2ef5d9ad39 initial version of EJB plugin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163520 13f79535-47bb-0310-9956-ffa450edef68
2005-03-10 17:14:39 +00:00
Brett Leslie Porter a44b6f9726 flip pom format
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163511 13f79535-47bb-0310-9956-ffa450edef68
2005-03-10 01:35:25 +00:00
John Dennis Casey 7f6f4452f2 o Changed Set to List for remote repo handling so that we can maintain declarative ordering in remote repos we use.
o Added UserModel support, integrated with maven-artifact and wagon via AuthenticationInfoProvider implementation.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163501 13f79535-47bb-0310-9956-ffa450edef68
2005-03-09 05:48:31 +00:00
Brett Leslie Porter 1fe8c76a3d move all artifact creation to artifact factory - further refactoring planned
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163499 13f79535-47bb-0310-9956-ffa450edef68
2005-03-09 02:39:10 +00:00
Brett Leslie Porter fecb4632b0 formatting
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163498 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 21:08:10 +00:00
Brett Leslie Porter ba74921b31 formatting fix
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163489 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 06:05:50 +00:00
Brett Leslie Porter b31db60bff tests and repairs for scope
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163486 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 05:34:52 +00:00
Brett Leslie Porter 1d615cd239 turn on logging, resolve some issues surrounding test dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163473 13f79535-47bb-0310-9956-ffa450edef68
2005-03-07 23:02:43 +00:00
Brett Leslie Porter 47da41f68e refactor source roots to be lists
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163470 13f79535-47bb-0310-9956-ffa450edef68
2005-03-07 20:56:23 +00:00
Brett Leslie Porter 6c36fe6f71 add basic test dependency handling
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163466 13f79535-47bb-0310-9956-ffa450edef68
2005-03-07 09:41:55 +00:00
Jason van Zyl 0c42b64caf o moving artifact request transformation mechanism inside the resolver
package as they artifact transformations will be utilized from within
  the resolver.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163456 13f79535-47bb-0310-9956-ffa450edef68
2005-03-03 15:37:25 +00:00
Brett Leslie Porter defeadfd09 activate the whole war plugin, not just the war:war goal
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163454 13f79535-47bb-0310-9956-ffa450edef68
2005-03-03 11:43:00 +00:00
Emmanuel Venisse c7f03630d9 Add war handler
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163447 13f79535-47bb-0310-9956-ffa450edef68
2005-03-02 13:36:16 +00:00
Brett Leslie Porter 11e305e84f clean up exceptions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163444 13f79535-47bb-0310-9956-ffa450edef68
2005-03-01 07:05:33 +00:00
Brett Leslie Porter 99219164fa clean up exceptions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163442 13f79535-47bb-0310-9956-ffa450edef68
2005-03-01 06:28:57 +00:00
Brett Leslie Porter 73576d5bec some clean up from inspections
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163441 13f79535-47bb-0310-9956-ffa450edef68
2005-03-01 06:20:30 +00:00
Brett Leslie Porter d4396153d0 start to push the lifecycle definition towards the type handlers
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163439 13f79535-47bb-0310-9956-ffa450edef68
2005-03-01 04:35:54 +00:00
Brett Leslie Porter ee0fe536a3 reformat
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163438 13f79535-47bb-0310-9956-ffa450edef68
2005-03-01 04:04:25 +00:00
Brett Leslie Porter c31bc6b7ce clean up some artifact related code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163406 13f79535-47bb-0310-9956-ffa450edef68
2005-02-24 05:33:18 +00:00
Brett Leslie Porter 8ad0f8f745 *very* quick download monitor. Instantiation and output to be reviewed later
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163348 13f79535-47bb-0310-9956-ffa450edef68
2005-02-10 07:09:57 +00:00
Brett Leslie Porter 54222773a9 ability to set a proxy for a wagon
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163343 13f79535-47bb-0310-9956-ffa450edef68
2005-02-08 07:48:08 +00:00
Brett Leslie Porter 440cb8d559 left behind an old reference
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163340 13f79535-47bb-0310-9956-ffa450edef68
2005-02-08 04:30:30 +00:00
Brett Leslie Porter d783d9ce98 reduce number of classes holding on to localRepository unnecessarily
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163339 13f79535-47bb-0310-9956-ffa450edef68
2005-02-08 04:12:58 +00:00
Brett Leslie Porter 797291178f cleanup: remove the remote repository list from the MavenMetadataSource as it was only used in retrieve(), and the equivalent list can be passed directly
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163338 13f79535-47bb-0310-9956-ffa450edef68
2005-02-08 03:26:06 +00:00
Jason van Zyl b4e6c5b907 {issue:MNG-73}
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163318 13f79535-47bb-0310-9956-ffa450edef68
2005-01-27 08:09:40 +00:00
Trygve Laugstol 2520812edf o Overriding hashCode() and equals().
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163306 13f79535-47bb-0310-9956-ffa450edef68
2005-01-13 09:37:44 +00:00
Carlos Sanchez Gonzalez 91c2856267 Added javadoc and war handlers
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163304 13f79535-47bb-0310-9956-ffa450edef68
2005-01-10 21:45:00 +00:00
Jason van Zyl d89b6de961 *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163283 13f79535-47bb-0310-9956-ffa450edef68
2004-12-29 06:59:23 +00:00
Jason van Zyl cd21e94926 o leave the setting of the path to the artifactResolver
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163269 13f79535-47bb-0310-9956-ffa450edef68
2004-12-27 05:11:29 +00:00
Jason van Zyl e3d6106465 o add a factory method to the wagonManager which creates an artifact as the artifact handler is required to correctly create the path for the artifact and this should all be handled internally.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163268 13f79535-47bb-0310-9956-ffa450edef68
2004-12-27 04:51:48 +00:00
Trygve Laugstol aa438b8137 o Adding a artifact handler for sources.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163235 13f79535-47bb-0310-9956-ffa450edef68
2004-11-22 12:46:55 +00:00
Jason van Zyl 6c955f6009 o updating wagon dep
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163222 13f79535-47bb-0310-9956-ffa450edef68
2004-10-26 00:48:14 +00:00
Jason van Zyl 275f002ac9 o updating to the latest wagon snapshots
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163221 13f79535-47bb-0310-9956-ffa450edef68
2004-10-26 00:42:32 +00:00
Jason van Zyl 0c72d1fb06 o remove the use of the deprecated basedir field in PlexusTestCase and use
the getBasedir() method.

o use the getBasedir() method in any test helpers that construct paths.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163201 13f79535-47bb-0310-9956-ffa450edef68
2004-10-23 13:33:59 +00:00
Jason van Zyl fa9735291f o putting into play the use of the artifact filter during the transitive
collection of artifacts.

  -> I was previously using a an exclude list but that was only taking into
     account the top-level pass of the artifacts so what was happening was
     things like maven-core weren't going in repeatedly but all of
     maven-core's deps were going in repeatedly. So by using the filter
     in the collector that sort of behaviour is stopped and now I can
     make the filter do anything I want to account for any weirdisms
     I subsequently encounter.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163185 13f79535-47bb-0310-9956-ffa450edef68
2004-10-06 14:30:00 +00:00
Jason van Zyl cf8d34fe69 o simple interface that will be used inside the resolver to allow artifacts to be filtered out from the result list.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163184 13f79535-47bb-0310-9956-ffa450edef68
2004-10-06 01:57:59 +00:00
Emmanuel Venisse b1b7930761 Fix artifact handling for unsupported artifact type.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163166 13f79535-47bb-0310-9956-ffa450edef68
2004-09-29 11:20:38 +00:00
Emmanuel Venisse a3374e3e8d Tes if handler exist before use it in path method.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163165 13f79535-47bb-0310-9956-ffa450edef68
2004-09-29 10:21:22 +00:00
Jason van Zyl ef61424a93 o my changes in plexus caused some nasty problems so i've backed
them out until tomorrow when i can take another shot.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163112 13f79535-47bb-0310-9956-ffa450edef68
2004-09-18 06:08:18 +00:00
Jason van Zyl a37f880493 o the assembly of the maven runtime more closely resembles what the
plexus runtime generator produces so that i may attempt to use it
  some point in the near future

o flipped back to 0.9-S of wagon until I run this on beaver to
  verify

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163110 13f79535-47bb-0310-9956-ffa450edef68
2004-09-18 04:22:07 +00:00
Jason van Zyl cb09fe8b9a updating to a-1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163108 13f79535-47bb-0310-9956-ffa450edef68
2004-09-18 02:47:10 +00:00
Jason van Zyl 5f37d77a2c *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163106 13f79535-47bb-0310-9956-ffa450edef68
2004-09-18 01:59:21 +00:00
Brett Leslie Porter c13e8c7629 PR: MNG-74
remove maven.properties use everywhere except classworlds conf


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163024 13f79535-47bb-0310-9956-ffa450edef68
2004-09-02 12:34:19 +00:00
John Dennis Casey a949eb66de o Removed GoalDecorationPhase, since goal decoration is now a part of the model
o Removed PluginDownloadPhase, since plugin resolution/download has to be a part of the prereq and pre/postGoal resolution, too
o Changed DefaultMaven to execute the session lifecycle, and the component wiring to likewise wire the DefaultMaven with a session lifecycle manager
o Removed the org.apache.maven.decoration package and its contents, since this is all in the model now
o Fixed the GoalResolutionPhase to verify each goal's plugin in turn as it resolves prereqs, preGoals and postGoals
o Fixed the GoalResolutionPhaseTest to work with the new resolution model
o Added a new createGoalExecutionContext to the MavenTestCase base class, to allow me to inject a MavenProject directly rather than a pom file
o Fixed the MavenLifecycleManagerTest to only expect 4 lifecycle phases, now than the plugin resolution and goal decoration phases are obsoleted
o All builds on local machine, but will depend on plexus-0.17.jar/pom and plexus-artifact-container-1.0-alpha-1.jar/pom to build on beaver
o I uploaded plexus-artifact-container-1.0-alpha-1.jar to ${plexus.home}/dist, but cannot upload POMs due to priveleges problem in poms dir.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163007 13f79535-47bb-0310-9956-ffa450edef68
2004-08-26 04:40:02 +00:00
John Dennis Casey 24ce8263d9 o Changed to depend on plexus-0.17 instead of -0.16
o Changed the embedder/container used to be the new artifact-aware container (plexus-artifact-container-1.0-alpha-1)
o Added new dependency to maven-core for artifact-container.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163006 13f79535-47bb-0310-9956-ffa450edef68
2004-08-26 01:18:19 +00:00
Brett Leslie Porter 48498cea35 fix typo in warning
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162994 13f79535-47bb-0310-9956-ffa450edef68
2004-08-21 00:15:53 +00:00
Brett Leslie Porter 36f1e02099 enhance/fix tests, and make resolver work correctly when at least one repo is good out of a list
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162989 13f79535-47bb-0310-9956-ffa450edef68
2004-08-17 20:58:29 +00:00
Brett Leslie Porter 0f706f5102 fix error message
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162977 13f79535-47bb-0310-9956-ffa450edef68
2004-08-15 04:30:31 +00:00
Jason van Zyl f7d630577d no message
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162965 13f79535-47bb-0310-9956-ffa450edef68
2004-08-11 20:14:14 +00:00
Jason van Zyl d0be8d9bf8 o changing the strategy for downloading to make File.renameTo workable.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162964 13f79535-47bb-0310-9956-ffa450edef68
2004-08-11 19:47:49 +00:00
Jason van Zyl 00ed8a3213 o when we can't find artifacts we hold that thought until all the repositories
are queried, if the artifact is not found in any repo then we complain.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162955 13f79535-47bb-0310-9956-ffa450edef68
2004-08-10 18:01:31 +00:00
Jason van Zyl c50fff6d0e o improve message reporting artifact resolution failure.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162947 13f79535-47bb-0310-9956-ffa450edef68
2004-08-10 12:51:37 +00:00
Jason van Zyl 8b4d55e55d *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162939 13f79535-47bb-0310-9956-ffa450edef68
2004-08-10 00:30:25 +00:00
Jason van Zyl 5812befc4d o renaming exception
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162938 13f79535-47bb-0310-9956-ffa450edef68
2004-08-10 00:29:44 +00:00
Jason van Zyl 91cb097ae3 plexus 0.16
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162931 13f79535-47bb-0310-9956-ffa450edef68
2004-08-09 19:38:15 +00:00
Jason van Zyl 15a7eb7ef2 Initial revision
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162914 13f79535-47bb-0310-9956-ffa450edef68
2004-08-09 18:37:31 +00:00