Commit Graph

1463 Commits

Author SHA1 Message Date
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
John Dennis Casey 1b4723f972 o Added more filters on the excludes.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163671 13f79535-47bb-0310-9956-ffa450edef68
2005-03-23 06:58:47 +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 1468ecbbad reformat
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163667 13f79535-47bb-0310-9956-ffa450edef68
2005-03-23 01:16:49 +00:00
Brett Leslie Porter b84d4bc35e revert <includes> and <excludes> in MDO to old format
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163666 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 14:26:28 +00:00
Brett Leslie Porter b022c6038f remove pom plugin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163665 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 13:52:24 +00:00
Brett Leslie Porter 1e121e8d1a convert plugin plugin to new execute()
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163664 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 13:44:17 +00:00
Brett Leslie Porter c5d7cd804c convert surefire plugin to new execute()
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163663 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 13:40:14 +00:00
Brett Leslie Porter 8a720065d5 fix license
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163662 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 13:34:29 +00:00
Brett Leslie Porter d0de5773b3 convert resources mojo to new execute().
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163661 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 13:33:29 +00:00
Brett Leslie Porter 964aa52888 convert install mojo to new execute().
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163660 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 13:30:48 +00:00
Brett Leslie Porter 092c2f75cf convert archive mojos to new execute(). More work is required to reuse the common fields.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163659 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 13:25:58 +00:00
Brett Leslie Porter f385f562f0 convert deploy mojo to new execute()
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163658 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 12:36:36 +00:00
Brett Leslie Porter d8bed9bc6c convert compiler mojo to new execute()
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163657 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 12:29:30 +00:00
Brett Leslie Porter 9a11321919 fix typo
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163656 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 12:29:03 +00:00
Brett Leslie Porter 32416cf540 check super classes for fields to set
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163655 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 12:28:36 +00:00
Brett Leslie Porter d9a6576761 don't aggregate plugins
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163654 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 11:42:23 +00:00
Brett Leslie Porter 3a1e4f0199 clean up plugin configuration handling
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163653 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 11:29:55 +00:00
Brett Leslie Porter e0e405fe68 clean up plugin configuration handling
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163652 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 10:46:55 +00:00
Brett Leslie Porter 336fa855be close file handle
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163651 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 10:07:01 +00:00
Brett Leslie Porter b63fd801d2 patch MDO for CI until proper removal is in place
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163650 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 09:58:19 +00:00
Brett Leslie Porter 82b9d8aa26 fix expected results
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163649 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 07:31:42 +00:00
Brett Leslie Porter 4b75d55af2 workaround what will be an ongoing problem with the plugin expressions at this point
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163648 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 07:31:29 +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 fb515206b5 remove context from request
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163646 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 06:51:59 +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
Brett Leslie Porter 7b1f2de259 can't be half and half! move to new plugin model
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163644 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 06:43:31 +00:00
Brett Leslie Porter 72d8486c7c add integration test for plugin configuration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163643 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 06:40:08 +00:00
Brett Leslie Porter 68f8dee678 add more functionality for testing configuration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163642 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 06:38:50 +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
Trygve Laugstol e54ce35409 o Changing the default notifier type from 'email' to 'mail'.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163640 13f79535-47bb-0310-9956-ffa450edef68
2005-03-21 14:38:59 +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
Brett Leslie Porter e1f51a9ad4 make the assembly mojo work, and use field type
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163637 13f79535-47bb-0310-9956-ffa450edef68
2005-03-21 07:59:28 +00:00
Brett Leslie Porter 1f757e62d9 fix for assembly MDO
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163636 13f79535-47bb-0310-9956-ffa450edef68
2005-03-21 07:23:48 +00:00
Brett Leslie Porter 3bd980bdb1 hack in a dom so we can use plexus configuration. more to do...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163635 13f79535-47bb-0310-9956-ffa450edef68
2005-03-21 07:23:07 +00:00
Brett Leslie Porter 28e193d14c AbstractLogEnabled is needed for archiver (not transitive in mboot)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163634 13f79535-47bb-0310-9956-ffa450edef68
2005-03-21 06:07:35 +00:00
Brett Leslie Porter a380e3ceb0 no need to throw an exception every time there is a compiler error, however make sure to process lines starting with "error: " as a compile error
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163633 13f79535-47bb-0310-9956-ffa450edef68
2005-03-21 06:06:42 +00:00
Brett Leslie Porter 1612049e44 don't attempt and fail to compile when there is no sources
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163632 13f79535-47bb-0310-9956-ffa450edef68
2005-03-21 05:33:52 +00:00
Brett Leslie Porter f5410a596f debug info in mboot
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163631 13f79535-47bb-0310-9956-ffa450edef68
2005-03-21 05:26:49 +00:00
Brett Leslie Porter d48af1ad15 fix error handling in javac if there is some other failure (eg bad parameters)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163630 13f79535-47bb-0310-9956-ffa450edef68
2005-03-21 05:26:32 +00:00
Brett Leslie Porter 847e6b8852 improve error handling
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163629 13f79535-47bb-0310-9956-ffa450edef68
2005-03-21 04:24:45 +00:00
Brett Leslie Porter f5bd920140 make the detection cleaner to make it easier to clean up later
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163628 13f79535-47bb-0310-9956-ffa450edef68
2005-03-21 04:00:46 +00:00
Brett Leslie Porter dab33490a5 most basic of field based plugins
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163627 13f79535-47bb-0310-9956-ffa450edef68
2005-03-21 03:49:17 +00:00
Brett Leslie Porter e452a9ca52 don't show if empty
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163626 13f79535-47bb-0310-9956-ffa450edef68
2005-03-21 01:48:44 +00:00