Commit Graph

90 Commits

Author SHA1 Message Date
Brett Leslie Porter 004c6cbdf3 snapshot resolution. commented out due to issues surrounding pom/artifact pairing
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163692 13f79535-47bb-0310-9956-ffa450edef68
2005-03-24 14:52:25 +00:00
Brett Leslie Porter a3d1a624be remove testing setting
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163690 13f79535-47bb-0310-9956-ffa450edef68
2005-03-24 12:23:35 +00:00
Brett Leslie Porter 5db2c4cf56 rewrite POM with new version on deployment
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163689 13f79535-47bb-0310-9956-ffa450edef68
2005-03-24 12:22:05 +00:00
Brett Leslie Porter b9de151229 fix deploy/install os standalone POMs
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163688 13f79535-47bb-0310-9956-ffa450edef68
2005-03-24 11:57:47 +00:00
Brett Leslie Porter e697f5bd8c deploy/install POMs as a type of metadata so they are done atomically
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163687 13f79535-47bb-0310-9956-ffa450edef68
2005-03-24 10:30:58 +00:00
Brett Leslie Porter b5e30a6ed5 allow file:// deployment
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163685 13f79535-47bb-0310-9956-ffa450edef68
2005-03-24 08:46:02 +00:00
Brett Leslie Porter 3f0f786e67 transform deployment of SNAPSHOT.
Currently, the POM and artifact are deployed separately, causing an inconsistent version to be written out.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163684 13f79535-47bb-0310-9956-ffa450edef68
2005-03-24 08:45:37 +00:00
Brett Leslie Porter 4ba9fbcc33 correct placement of transformations
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163682 13f79535-47bb-0310-9956-ffa450edef68
2005-03-24 05:18:41 +00:00
Brett Leslie Porter ee15019eb8 refactor maven-artifact: first pass, reduce the usage of setPath()
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163681 13f79535-47bb-0310-9956-ffa450edef68
2005-03-24 05:01:06 +00:00
Brett Leslie Porter b7290449e2 add notes on current limitations
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163678 13f79535-47bb-0310-9956-ffa450edef68
2005-03-23 15:10:38 +00:00
Brett Leslie Porter 701911f219 scaffolding for remote transformation
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163677 13f79535-47bb-0310-9956-ffa450edef68
2005-03-23 15:03:39 +00:00
Brett Leslie Porter 2727721b11 add artifact metadata on installation of snapshot in a local repository
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163676 13f79535-47bb-0310-9956-ffa450edef68
2005-03-23 14:55:15 +00:00
Brett Leslie Porter 5e2caf89c7 o put all of the path functions back into the artifact handler manager - that class likely needs a rename.
o Removed AbstractArtifactComponent as it was simply delegating to the class and prevented other inheritence for the resolver which seems more appropriate.
o fixed test failure in ProjectClasspathTest due to incorrectly constructed component - using plexus even though still working around the problem with a hack


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163675 13f79535-47bb-0310-9956-ffa450edef68
2005-03-23 08:42:57 +00:00
Brett Leslie Porter 7c82aceb35 make method signatures consistent
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163674 13f79535-47bb-0310-9956-ffa450edef68
2005-03-23 07:43:38 +00:00
Brett Leslie Porter 2b85350558 o a little refactoring
o hook in snapshot transformation, though it isn't used


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163673 13f79535-47bb-0310-9956-ffa450edef68
2005-03-23 07:41:39 +00:00
Brett Leslie Porter 14acea5e3f move artifact transformations out of the resolver so they can be used on any artifact component
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163672 13f79535-47bb-0310-9956-ffa450edef68
2005-03-23 07:23:23 +00:00
Brett Leslie Porter 14bb2c805a change the maven group ID
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163670 13f79535-47bb-0310-9956-ffa450edef68
2005-03-23 06:52:55 +00:00
John Dennis Casey 80880d071e o Fixed a configuration issue for the DefaultRepositoryLayout in components.xml...it needed a requirement on the ArtifactHandlerManager.
o Fixed a formatting issue for the layout in DefaultRepositoryLayout relating to groupId's.
o Revamped the repoclean tool to use an Artifact-centric approach to converting, cleaning, and reporting on repositories.
o Added the ability for repoclean to report on the health of an existing v3 or v4 repository, using a DefaultArtifactDiscoverer (Default* being the prefix given to the new repo layout going forward) and a V4PomRewriter implementation.
o Tested repoclean by converting my local m1 repository to a m2 repository.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163669 13f79535-47bb-0310-9956-ffa450edef68
2005-03-23 04:53:30 +00:00
Brett Leslie Porter 5b29c8a7dd update licenses and reformat
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163668 13f79535-47bb-0310-9956-ffa450edef68
2005-03-23 03:40:13 +00:00
Brett Leslie Porter 297f542553 remove extension from artifact - it is the sole reponsibility of the artifact handler. This prevents the error of plugins getting the extension "maven-plugin"
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163647 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 07:23:17 +00:00
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