Commit Graph

276 Commits

Author SHA1 Message Date
Carlos Sanchez Gonzalez 64e0d64a56 Store the pom File object in the execution request instead of its path
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@587998 13f79535-47bb-0310-9956-ffa450edef68
2007-10-24 20:07:08 +00:00
Jason van Zyl b762ce620c o put the tycho profile back
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@587800 13f79535-47bb-0310-9956-ffa450edef68
2007-10-24 06:58:27 +00:00
Carlos Sanchez Gonzalez 1241d1b299 Kept John's constructors but still use File/URL instead of String
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@587692 13f79535-47bb-0310-9956-ffa450edef68
2007-10-23 23:23:22 +00:00
Carlos Sanchez Gonzalez efd372c24a Restore backwards compatibility readding static OS_* vars
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@587684 13f79535-47bb-0310-9956-ffa450edef68
2007-10-23 22:55:53 +00:00
Jason van Zyl c81694144f o cleaning up debug output
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@587649 13f79535-47bb-0310-9956-ffa450edef68
2007-10-23 20:33:43 +00:00
Jason van Zyl 7f8b8699a5 o for milos' test i am now adding the component to the container programmatically so we don't need to manually stuff an artifact handler into
the artifact handler manager


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@587648 13f79535-47bb-0310-9956-ffa450edef68
2007-10-23 20:33:10 +00:00
Jason van Zyl 959ea187df o fork never for every build except the embedder, something in surefire is causing a verify error if I fork all the other builds
o get rid of the tycho profile, eugene has made his own eclipse plugin thingy and doesn't need the felix plugin which doesn't work properly or half-ass attempt at making a manifest


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@587571 13f79535-47bb-0310-9956-ffa450edef68
2007-10-23 17:42:19 +00:00
Herve Boutemy 353cd5bac4 [MNG-2254] support XML file encoding when writing settings
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@587489 13f79535-47bb-0310-9956-ffa450edef68
2007-10-23 12:56:21 +00:00
Jason van Zyl 60f9555333 o use the programmatic setup of the container
o use the new active collections in Pleuxus


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@587015 13f79535-47bb-0310-9956-ffa450edef68
2007-10-22 07:07:29 +00:00
John Dennis Casey eb2e63bd5b Excluding jdom from bin assembly, since it's brought in by maven-model and maven-profile still...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@586105 13f79535-47bb-0310-9956-ffa450edef68
2007-10-18 19:54:19 +00:00
John Dennis Casey b9995dfb60 Updating reporting for mojo failures.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@586100 13f79535-47bb-0310-9956-ffa450edef68
2007-10-18 19:38:16 +00:00
Jason van Zyl 3979ed47d3 o removing jdom from the core for the embedder and we will soon have a different tool for writing out POMs, trying to slim
down the core


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@586044 13f79535-47bb-0310-9956-ffa450edef68
2007-10-18 18:05:59 +00:00
Jason van Zyl 8f084c95db o updating assembly and that we don't need the shaded jar anymore
o keep JDOM in the distro for the time being


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@585563 13f79535-47bb-0310-9956-ffa450edef68
2007-10-17 16:32:51 +00:00
Herve Boutemy eecea0895e [MNG-2254] support XML file encoding when reading/writing settings and pom files
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@585265 13f79535-47bb-0310-9956-ffa450edef68
2007-10-16 21:26:43 +00:00
John Dennis Casey ac8ff20611 Adding project-level ClassRealm, which serves as a nexus for extensions. Extensions are loaded into separate ClassRealm instances, then scanned for components. These ComponentDescriptors are then used to add an import from the extension realm back to the project-session realm, and then the descriptor is added to the container with the project realm as its RealmId. From here, the registerWagons() method has been changed to use the map of projectSessions, and iterates through each project-level realm, setting the lookup-realm, then calling findAndRegisterWagons(..) for each. Also, the plugin manager has been changed to use the project-realm for loading plugins if it exists (the plugin realm becomes a child of the project realm, which should allow plugins to vary by project within a single reactor, though I haven't tested that yet).
Also, shading the embedder to hide the jdom classes, and adjusting the assembly appropriately.

Final thing: I'm rolling back some changes I accidentally made to the CLIManager the other day, which breaks the release plugin because the long options were removed for some reason (save action in Eclipse; don't ask).


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@585012 13f79535-47bb-0310-9956-ffa450edef68
2007-10-16 02:59:05 +00:00
John Dennis Casey 0d0f7396b2 Cleaning up exception wrapping to allow better reporting of errors to end users. Also implementing the beginnings of a new error reporter, and bumping the version of plexus-container-default up to 1.0-alpha-33-SNAPSHOT to improve the accessibility to ClassRealm info for ComponentLookupException.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@584343 13f79535-47bb-0310-9956-ffa450edef68
2007-10-13 00:10:29 +00:00
John Dennis Casey 957a77435a some formatting
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@583515 13f79535-47bb-0310-9956-ffa450edef68
2007-10-10 15:31:09 +00:00
John Dennis Casey dc6e7c8368 [MNG-3194] Fixing logging problems, but error diagnosis is still missing from CLI version of things...this should probably be replaced and/or restored. I'll commit unit tests for 3194 next.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@583314 13f79535-47bb-0310-9956-ffa450edef68
2007-10-09 22:28:02 +00:00
Jason van Zyl 975862e353 test project for the missing parent pom
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@583031 13f79535-47bb-0310-9956-ffa450edef68
2007-10-09 00:46:28 +00:00
Jason van Zyl 112e69aa0e o adjusting the request to hold the upfront repositories that can be taken out of profiles
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@582071 13f79535-47bb-0310-9956-ffa450edef68
2007-10-05 04:03:10 +00:00
Jason van Zyl 5d2c433ba9 o applying patch to allow to read the model with a reader
Submitted by: Eugene Kuleshov


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@581732 13f79535-47bb-0310-9956-ffa450edef68
2007-10-03 21:40:17 +00:00
Jason van Zyl b3461d5936 o If we are not actually in an SVN repository then don't run tests that require SVN.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@580653 13f79535-47bb-0310-9956-ffa450edef68
2007-09-29 22:11:05 +00:00
Jason van Zyl e6a6476ad7 o cleaning up the project builder, deprecating maven 1.x repository support, it will be 3 years by the time this is actually released
so tough noogies for people still trying to use Maven 1.x repositories with Maven 2.x.

  The next series of refactoring I will be doing with GIT.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@580609 13f79535-47bb-0310-9956-ffa450edef68
2007-09-29 17:25:19 +00:00
Brett Leslie Porter 3bc1f858e1 removing JDK 5 API and adding some notes
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573953 13f79535-47bb-0310-9956-ffa450edef68
2007-09-09 06:29:48 +00:00
Brett Leslie Porter e76401752d [MNG-3088] s/maven/apache-maven/ in the assembly
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573932 13f79535-47bb-0310-9956-ffa450edef68
2007-09-08 23:42:20 +00:00
Jason van Zyl 14ff3302d0 o block a few more artifacts out of the assembly
o the populator now has a clear populate() that shows how the request is being constructed, there should be nothing beyond the embedder now
  the does any of this configuration and loading and it should remain this way. no processing of settings or profiles deep in the bowels
  of Maven is all happens in the populator.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573783 13f79535-47bb-0310-9956-ffa450edef68
2007-09-08 04:04:48 +00:00
Jason van Zyl d72b8bc88a o put the profile manager back into place as the project build is exposed in a ton of plugin. arrrg.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573718 13f79535-47bb-0310-9956-ffa450edef68
2007-09-07 21:29:08 +00:00
Jason van Zyl e9b6657f4c o scrub of the settings building, was able to reduce to the need of the build context and use the execution request
directly. eventually i will get it to be the session, along with the profile tools, then all the tools can also 
  share a common interpolator, which can then be shared by other components instead of having 5 interpolators lying
  around causing a great deal of inconsistency.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573494 13f79535-47bb-0310-9956-ffa450edef68
2007-09-07 07:54:11 +00:00
Jason van Zyl 9c8903441f o profiles are now decoupled from settings. so that i don't do this is one huge commit i need to move settings stuff into the core
while i transform the settings components to take a MavenSession. Any component executing within Maven should be able to use
  a session. the session will contain everything required and any new component added to the system should only take the 
  session as a parameter. same pattern for all components. that's the goal. it will take a few hops.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573462 13f79535-47bb-0310-9956-ffa450edef68
2007-09-07 05:25:49 +00:00
Jason van Zyl d919345800 o adding components the populator needs, it's handling settings building now
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573439 13f79535-47bb-0310-9956-ffa450edef68
2007-09-07 03:51:04 +00:00
Jason van Zyl c8cf70d2da o use cli options the same way as in other places
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573438 13f79535-47bb-0310-9956-ffa450edef68
2007-09-07 03:50:26 +00:00
Jason van Zyl a698b7ef49 o the request populator is now responsible for initializing everything, anything you want to know about how the front-end is configuration, or initialized can be found in this class. i think i have almost everything out of the Maven component and in the Embedder. this is the one place to look now and I know feel comfortable about documenting it
o the profiles additions from settings are now process in the request populator and taken out of the default profile manager itself which has resulted in decoupling the Settings from the profile manager.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573435 13f79535-47bb-0310-9956-ffa450edef68
2007-09-07 03:47:07 +00:00
Jason van Zyl 99bd5ac68f o trying to get a grasp of the entire profile mechanism, especially in relation to how they deal with repositories.
here i am just collecting all the profile code into one place as it's scattered over several packages and is
  hard to determine what the profile system as a whole is doing. the first task i would like to do is decouple
  the profile system from the Settings. this can be done at the front-end i.e the profile information from Settings
  can be fed into the profile manager up front.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573325 13f79535-47bb-0310-9956-ffa450edef68
2007-09-06 17:09:36 +00:00
Jason van Zyl 2769a95f9d o part of my test slipped in before it's finished
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573128 13f79535-47bb-0310-9956-ffa450edef68
2007-09-06 00:55:36 +00:00
Jason van Zyl e4d54ae2da more of the sample import
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573092 13f79535-47bb-0310-9956-ffa450edef68
2007-09-05 23:00:18 +00:00
Jason van Zyl 8b77989253 o inconsistent new lines from windows blew up the import (why is svn so retarded?)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573091 13f79535-47bb-0310-9956-ffa450edef68
2007-09-05 22:58:29 +00:00
Jason van Zyl 558f841229 o a complex sample project to test a new import model that should make it far easier for IDE integration. I'm tired of looking at duplicated code.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573090 13f79535-47bb-0310-9956-ffa450edef68
2007-09-05 22:52:27 +00:00
Jason van Zyl ae1501b9f6 o collecting all logging/eventing into the core. i posted a list of possible errors that can occur in the core, the stuff we had was only
partially being use and we problems being emitted with messages like:

  NOTE: One or more purely derived expression elements were detected in this expression. 
  If you continue to get this error after any other expression elements are specified correctly
  please report this issue to the Maven development team.

  I think we have to make a very concerted effort to make useful messages because I'm tired of standing behind Maven
  users and being embarrassed when they look at me and ask "what does that mean?". "i actually have no idea."


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@572456 13f79535-47bb-0310-9956-ffa450edef68
2007-09-04 00:05:04 +00:00
Jason van Zyl 2a241710f0 MNG-3182
MNG-3183

First cleanup of the logging code (it is still a mess), but all the console logging has been removed from the Maven component and pushed back
into the CLI code. As a result we now have a way to log to a file easily.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@572408 13f79535-47bb-0310-9956-ffa450edef68
2007-09-03 19:33:10 +00:00
Jason van Zyl 441b918f80 o try and start localizing the handling of -f, release poms, and normal poms to the embedder. just too much funk
going on in the core.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@572388 13f79535-47bb-0310-9956-ffa450edef68
2007-09-03 16:52:37 +00:00
Jason van Zyl cc1ca10d74 o separating out the MavenEmbedderProjectWithExtensionReadingTest which shows that the artifacts handlers must be loaded up-front
in the readProjectWithDependencies method because it is not being done in the core unless projects are executed. So Milos' assertion
  is correct. I'm now looking at a layered approach for project resolution and then execution so that the readProjectWithDependencies
  (which is essential for IDE integration) will yield something that can be pushed into the lifecycle executor. Right now there
  is much duplication which makes the IDE integration crappy.

  Another result of this is trying to create a simple IDE import model that gives back client code the fully resolved, topo sorted
  set of projects which point to binary dependencies outside the reactor, and to source folders inside the reactor. The result will
  be a useful model for all IDE integration, right now everyone is doing their own thing. This model will need hooks for customization
  to take into account turning "workspace resolution" on/off and allow easy overriding of this process.

o Fixed IT0035



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@572366 13f79535-47bb-0310-9956-ffa450edef68
2007-09-03 15:42:29 +00:00
Jason van Zyl 01f970117a o if we are given a base directory, set the actual POM file in the populator, we can eventually move a lot of the logic that is in the CLI there because it's not CLI specific
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@572237 13f79535-47bb-0310-9956-ffa450edef68
2007-09-03 06:23:09 +00:00
Jason van Zyl 2425f945fb o adding a validation method to the lifecycle executor so that I can tell users what is wrong before actually trying
to execute the lifecycle. Trying to do this validation shows in detail how tangled some of our code is as I need
  to create the dispatcher in order to create the session which is required to make the reactorManager which 
  is required to get the project required to validate the goal name ... yah.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@572214 13f79535-47bb-0310-9956-ffa450edef68
2007-09-03 02:35:05 +00:00
Jason van Zyl 5c5c39e8ec o use ${pom.version} and not just ${version}
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@572213 13f79535-47bb-0310-9956-ffa450edef68
2007-09-03 02:25:41 +00:00
Jason van Zyl 5380116b79 MNG-2398: the lifecycle executor exception wasn't being propagated properly.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@572210 13f79535-47bb-0310-9956-ffa450edef68
2007-09-03 01:39:28 +00:00
Jason van Zyl 4005482797 MNG-2935: make sure build tanks if the settings are bad (user and global)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@572180 13f79535-47bb-0310-9956-ffa450edef68
2007-09-02 22:48:43 +00:00
Jason van Zyl 248c7199a0 o remove redundancy
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@572041 13f79535-47bb-0310-9956-ffa450edef68
2007-09-02 17:25:01 +00:00
Jason van Zyl fc05e3e050 o a project to test the resolution of projects when they are not installed in the local repository. this makes sure that
IDE integration works for newly created projects that have inter-module dependencies.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@571905 13f79535-47bb-0310-9956-ffa450edef68
2007-09-02 00:02:23 +00:00
Jason van Zyl 8ce69da938 o separate out the embedder tests into packages by concern
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@571902 13f79535-47bb-0310-9956-ffa450edef68
2007-09-02 00:01:02 +00:00
Jason van Zyl e72f6758be o script for creating the eclipse integration jar
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@571901 13f79535-47bb-0310-9956-ffa450edef68
2007-09-02 00:00:32 +00:00