Commit Graph

641 Commits

Author SHA1 Message Date
Jason van Zyl 552b22c77a o the first phase of merging plugin configuration as defined in the POM
with defaults and user defined values.

  After a chat with emmanuel we decided that we would allow for plugin
  wide configuration and mojo/goal specific configuration with the more
  specific mojo/goal configuration winning in the event a parameter is
  defined in both places. Currently only plugin wide parameters are
  being considered: I still need to update the model for mojo/goal
  specific parameters and then update the parameter merging code.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163181 13f79535-47bb-0310-9956-ffa450edef68
2004-10-01 18:00:09 +00:00
Jason van Zyl b6ba62ae98 o sketch of plugin configuration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163180 13f79535-47bb-0310-9956-ffa450edef68
2004-10-01 16:39:52 +00:00
Jason van Zyl e26f756e8f o adding necessary bits and bobs for plugin configuration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163179 13f79535-47bb-0310-9956-ffa450edef68
2004-10-01 14:53:48 +00:00
Jason van Zyl 3ec86ab1ea o adding <plugins/> element to the model that will be used for configuring
plugins (i am getting tired of the -Dfoo=bar mucking).


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163178 13f79535-47bb-0310-9956-ffa450edef68
2004-10-01 14:36:23 +00:00
Jason van Zyl 22f5fe58dc o i want a whole canonical test, but we know most things are working from the integration tests and i am specifically interested in plugin configuration at the moment so that's what's going in right now.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163177 13f79535-47bb-0310-9956-ffa450edef68
2004-10-01 14:12:40 +00:00
Emmanuel Venisse ed31ac5175 Fix mapStyle attribute. The correct name is xml.mapStyle
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163176 13f79535-47bb-0310-9956-ffa450edef68
2004-10-01 12:35:20 +00:00
Jason van Zyl a699b769da o improve message when required parameter is null
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163175 13f79535-47bb-0310-9956-ffa450edef68
2004-09-30 16:11:11 +00:00
Jason van Zyl 4072630050 o the required field was not being written out correctly. now it is and an exception is thrown when a required parameter is null.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163174 13f79535-47bb-0310-9956-ffa450edef68
2004-09-30 16:10:30 +00:00
Jason van Zyl 9f4113bb5b o perform some minimal validation of the plugin configuration parameters to make sure they are not null when the parameter is required. throw an exception is the parameter that is required is null.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163173 13f79535-47bb-0310-9956-ffa450edef68
2004-09-30 15:48:54 +00:00
Jason van Zyl 4a14895569 o if an expression evaluates to null then let it let it go through so that it can be examined by the minimal validation now present.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163172 13f79535-47bb-0310-9956-ffa450edef68
2004-09-30 15:47:49 +00:00
Jason van Zyl bdcd0670ed o accounting for a change i just made in maven-core
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163171 13f79535-47bb-0310-9956-ffa450edef68
2004-09-30 15:46:38 +00:00
Jason van Zyl 33f0f06a11 o throw an exception when there is a plugin configuration problem whether
that be a bad expression or validation problem.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163170 13f79535-47bb-0310-9956-ffa450edef68
2004-09-30 15:09:48 +00:00
Jason van Zyl 15b1a54fee o we want to throw an exception when there is a problem with the configuration of a plugin whether that be an ognl expression evaluation problem or a plugin parameter validation problem
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163169 13f79535-47bb-0310-9956-ffa450edef68
2004-09-30 14:54:39 +00:00
Emmanuel Venisse 36e362367b Add automatically maven.repo.local to system properties.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163168 13f79535-47bb-0310-9956-ffa450edef68
2004-09-30 14:48:07 +00:00
Emmanuel Venisse c894f62970 MNG-86. Fix bootstrap failures when M2_HOME contains spaces.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163167 13f79535-47bb-0310-9956-ffa450edef68
2004-09-30 08:49:20 +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
Emmanuel Venisse e07d3929ae Activate the xdoc generation for the model.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163164 13f79535-47bb-0310-9956-ffa450edef68
2004-09-27 12:49:54 +00:00
Emmanuel Venisse 1fa014b17b *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163163 13f79535-47bb-0310-9956-ffa450edef68
2004-09-26 20:29:51 +00:00
Emmanuel Venisse 7f564a214d Update plexus version for modello.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163162 13f79535-47bb-0310-9956-ffa450edef68
2004-09-26 20:26:03 +00:00
Emmanuel Venisse 3904fc81eb Remove modello-xdoc.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163161 13f79535-47bb-0310-9956-ffa450edef68
2004-09-26 20:21:07 +00:00
Emmanuel Venisse 78de36fa72 We use now the new modello.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163160 13f79535-47bb-0310-9956-ffa450edef68
2004-09-26 13:29:06 +00:00
Emmanuel Venisse 9eccf7e139 Fix parent field.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163159 13f79535-47bb-0310-9956-ffa450edef68
2004-09-24 15:34:11 +00:00
Emmanuel Venisse bea17db376 The new model for the new modello. Not tested for the moment.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163158 13f79535-47bb-0310-9956-ffa450edef68
2004-09-24 14:57:07 +00:00
Brett Leslie Porter 6e812f1d2e work without M2_HOME - base on location of batch file
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163157 13f79535-47bb-0310-9956-ffa450edef68
2004-09-24 14:48:18 +00:00
Emmanuel Venisse d24fa87cb6 Add M2_HOME by default, it will be use if we don't define maven.home as command line argument.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163156 13f79535-47bb-0310-9956-ffa450edef68
2004-09-24 14:10:44 +00:00
Jason van Zyl 8eba14b8e1 *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163155 13f79535-47bb-0310-9956-ffa450edef68
2004-09-23 17:10:03 +00:00
Jason van Zyl 6691c4403a Initial revision
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163152 13f79535-47bb-0310-9956-ffa450edef68
2004-09-23 17:09:22 +00:00
Jason van Zyl a059bd147f fixing artifact id
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163151 13f79535-47bb-0310-9956-ffa450edef68
2004-09-23 17:04:53 +00:00
Jason van Zyl 7d50ca4e22 o active it0008
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163150 13f79535-47bb-0310-9956-ffa450edef68
2004-09-23 17:01:40 +00:00
Jason van Zyl 71895f7201 o adding it0008 to test preGoals where the preGoal exists in a plugin
that must be downloaded before it is executed.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163149 13f79535-47bb-0310-9956-ffa450edef68
2004-09-23 17:01:31 +00:00
Jason van Zyl c9bf7d2052 Initial revision
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163146 13f79535-47bb-0310-9956-ffa450edef68
2004-09-23 17:00:41 +00:00
Jason van Zyl 40734471d8 o use the dispatcher
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163145 13f79535-47bb-0310-9956-ffa450edef68
2004-09-23 16:53:20 +00:00
Jason van Zyl fab3a26fd7 Initial revision
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163142 13f79535-47bb-0310-9956-ffa450edef68
2004-09-23 16:42:23 +00:00
Jason van Zyl a8db29528c o point the remote repo download to the first dispatcher
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163141 13f79535-47bb-0310-9956-ffa450edef68
2004-09-23 16:26:22 +00:00
Jason van Zyl 35944429d0 o pointing the download at the first dispatcher
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163140 13f79535-47bb-0310-9956-ffa450edef68
2004-09-23 16:25:47 +00:00
Jason van Zyl ec6e54593a o correction for install, trying to set someone up
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163139 13f79535-47bb-0310-9956-ffa450edef68
2004-09-23 15:04:30 +00:00
John Dennis Casey 8e6c7b0424 o Fixed functionality to disable dependency resolution and download for things like clean:clean.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163138 13f79535-47bb-0310-9956-ffa450edef68
2004-09-22 03:31:41 +00:00
John Dennis Casey 5f23120ff6 o Fixed goal decorator inheritance deficiency.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163137 13f79535-47bb-0310-9956-ffa450edef68
2004-09-22 02:58:12 +00:00
Jason van Zyl a793d673b4 o add decorator delegation
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163136 13f79535-47bb-0310-9956-ffa450edef68
2004-09-22 02:29:26 +00:00
John Dennis Casey 90c3f69e1c o removed the current mojo descriptor stuff from the goal execution context...doesn't seem to be used anywhere, and it'll cause problems if the current goal is from a plugin that has not been resolved yet.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163135 13f79535-47bb-0310-9956-ffa450edef68
2004-09-22 00:23:35 +00:00
John Dennis Casey 717f716b4f o Trying to get the damn CVS update to take...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163134 13f79535-47bb-0310-9956-ffa450edef68
2004-09-21 23:38:30 +00:00
John Dennis Casey 3e49095f26 o Added code to populate the visited set for the goal mapping phase.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163133 13f79535-47bb-0310-9956-ffa450edef68
2004-09-21 23:33:02 +00:00
John Dennis Casey 78563d686f o Refactored the goal/plugin resolution part of the lifecycle.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163132 13f79535-47bb-0310-9956-ffa450edef68
2004-09-21 23:11:16 +00:00
Brett Leslie Porter cd6f43bcf1 add type to key in v3
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163130 13f79535-47bb-0310-9956-ffa450edef68
2004-09-21 13:48:47 +00:00
Brett Leslie Porter 1f36126287 crappy temporary build stuff for the maven 1.1 model
should be replaced really soon with:
- correction of properties bug in modello
- addition of a --package command to modello
- maven plugin for modello


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163129 13f79535-47bb-0310-9956-ffa450edef68
2004-09-21 11:05:54 +00:00
Brett Leslie Porter 425d44a54b clean up
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163128 13f79535-47bb-0310-9956-ffa450edef68
2004-09-21 10:57:57 +00:00
John Dennis Casey 318f91c3f4 o This wasn't working on FC1, so I used an intermediary to store the location of BIN_DIR and then used dirname a section time to trim the "/bin" from the M2_HOME path.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163127 13f79535-47bb-0310-9956-ffa450edef68
2004-09-21 00:45:35 +00:00
Jason van Zyl b95cfd63d1 wrong date format
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163126 13f79535-47bb-0310-9956-ffa450edef68
2004-09-20 05:13:19 +00:00
Jason van Zyl 530df30bec typo
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163125 13f79535-47bb-0310-9956-ffa450edef68
2004-09-20 03:55:38 +00:00