Commit Graph

1823 Commits

Author SHA1 Message Date
Emmanuel Venisse 6d4626e2d6 o Fix copy of resources directory for exclude all "default" files
o Fix xhtml for conformance with standard

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179320 13f79535-47bb-0310-9956-ffa450edef68
2005-06-01 00:24:37 +00:00
John Dennis Casey 215c30bbb3 Moved the packages org.apache.maven.model.settings and org.apache.maven.model.profiles to org.apache.maven.settings and org.apache.maven.profiles, respectively.
This is restoring the settings to their original package structure, and putting profiles next to it...the change I'm reversing was not a good one, conceptually.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179289 13f79535-47bb-0310-9956-ffa450edef68
2005-05-31 21:48:55 +00:00
John Dennis Casey 25fb7c646d improved the error diagnosis for invalid plugin parameters, as in MNG-345
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179274 13f79535-47bb-0310-9956-ffa450edef68
2005-05-31 21:01:25 +00:00
John Dennis Casey 23f82d0199 o Added runtime exception to construction of DefaultArtifact, when one or more of the four attributes required for object identity are null
o Created corresponding runtime exception: InvalidArtifactRTException
o Added error diagnoser for InvalidArtifactRTException
o Changed logError() in DefaultMaven to use error diagnosers (even the devs could use a hand!)
o Added unit test for InvalidArtifactDiagnoser.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179265 13f79535-47bb-0310-9956-ffa450edef68
2005-05-31 19:31:58 +00:00
John Dennis Casey f1f5758d8a still trying to get this change put through...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179236 13f79535-47bb-0310-9956-ffa450edef68
2005-05-31 16:30:15 +00:00
John Dennis Casey 9d7e54c042 o Added model and builder support for Profiles specified in settings.xml, profiles.xml, and the POM.
o Changed MBoot and Verifier accordingly.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179233 13f79535-47bb-0310-9956-ffa450edef68
2005-05-31 16:24:34 +00:00
Jason van Zyl 0221f23157 o improving error report so that you know what the g:a is if the version and
type are null.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179232 13f79535-47bb-0310-9956-ffa450edef68
2005-05-31 16:13:01 +00:00
Jason van Zyl 6e83944830 o tidy up the site template
o set the classloader used where the template will be found


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179176 13f79535-47bb-0310-9956-ffa450edef68
2005-05-31 00:39:51 +00:00
Brett Leslie Porter ec805f988f PR: MNG-411
Submitted By: Vincent Siveton
Reviewed By:  Brett Porter
clean up the mailing list report


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179174 13f79535-47bb-0310-9956-ffa450edef68
2005-05-31 00:01:18 +00:00
Emmanuel Venisse b3d4163c60 Fix report generation in a mojo context.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179172 13f79535-47bb-0310-9956-ffa450edef68
2005-05-30 23:36:29 +00:00
Emmanuel Venisse 2e3a99cd03 Use a release version of plexus i18n
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179148 13f79535-47bb-0310-9956-ffa450edef68
2005-05-30 21:10:56 +00:00
Emmanuel Venisse 4e6b33d359 o upgrade plexus-container to alpha-4-SNAPSHOT
o upgrade plexus-utils to alpha-3 until xpp stuff is fix in 1.0.0

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179122 13f79535-47bb-0310-9956-ffa450edef68
2005-05-30 18:24:32 +00:00
Brett Leslie Porter 17518785ac upgrade to container with separated utils
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178995 13f79535-47bb-0310-9956-ffa450edef68
2005-05-29 22:55:12 +00:00
Emmanuel Venisse 26141c2358 o Extends AbstractReport to AbstractMojo => we need now to create only one class for a report and a mojo
o Start implementation of internationalization

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178980 13f79535-47bb-0310-9956-ffa450edef68
2005-05-29 19:52:01 +00:00
Jason van Zyl 2545065cc7 should be project not model
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178959 13f79535-47bb-0310-9956-ffa450edef68
2005-05-29 14:46:52 +00:00
Emmanuel Venisse d6ba438cdb Remove unused file
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178889 13f79535-47bb-0310-9956-ffa450edef68
2005-05-28 21:05:53 +00:00
Emmanuel Venisse e77af09a3b Clean import
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178888 13f79535-47bb-0310-9956-ffa450edef68
2005-05-28 20:49:16 +00:00
Emmanuel Venisse 27cbac3e16 Use plexus-site-renderer for generate site with velocity templates.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178887 13f79535-47bb-0310-9956-ffa450edef68
2005-05-28 20:35:37 +00:00
John Dennis Casey fda1ed95c9 o changed the inheritanceApplied flag to be set by default, and unset if the plugin is merged to the child without <inherit/> being specified...this makes it work with isolated POMs.
o changed the semantics of when the unsetInheritanceApplied() method is called...it's now only when <inherit/> is NOT set.
o changed the default inheritByDefault attribute on MojoDescriptor to be true
o added inheritByDefault to PluginDescriptor (even though we don't have tools supporting it yet), with semantics identical to MojoDescriptor
o added generator/builder support for the inheritByDefault attribute of PluginDescriptor
o added calculation of inheritanceApplied || inheritByDefault to lifecycle executor before allowing plugins/mojos to bind.
o Everything builds, but we need some sort of IT to test the finer points.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178836 13f79535-47bb-0310-9956-ffa450edef68
2005-05-27 23:05:09 +00:00
John Dennis Casey 6ca4de295d Added inheritance of Plugins according to the rules we decided upon. This consists of:
- inheritanceApplied flag on Plugin and Goal (NOT fields, just a code-only flag)
- flushGoalMap/flushPluginMap to clear caching of these calculated attributes
- ModelUtils.mergePluginLists() and ModelUtils.mergePluginDefinitions() for use in both
    * DefaultModelInheritanceAssembler (Plugin/PluginManagement lists)
    * DefaultModelDefaultsInjector (PluginManagement -> Plugin merges)

- Also added a few unit tests for basic Plugin inheritance stuff. This could be more thoroughly tested...

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178825 13f79535-47bb-0310-9956-ffa450edef68
2005-05-27 21:47:12 +00:00
Brett Leslie Porter 771fc3a8c9 correct the getting started guide in light of alpha-2
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178751 13f79535-47bb-0310-9956-ffa450edef68
2005-05-27 05:25:38 +00:00
John Dennis Casey 6836449307 adding my notes for implementing plugin inheritance and build profiles. delete if not needed.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178734 13f79535-47bb-0310-9956-ffa450edef68
2005-05-27 03:29:54 +00:00
John Dennis Casey 239439bb04 o Added inherited field to the Plugin and Goal classes in maven.mdo
o Added annotation inheritedByDefault (looks like: @inheritedByDefault true|false) for java mojos
o Added support for inheritedByDefault to MojoDescriptor, descriptor generator and builder
o Factored the plugin combinatorial logic into ModelUtils in o.a.m.project, for later reuse in a plugin-aware model inheritance builder
o Refactored the DefaultModelDefaultsInjector to use the new ModelUtils for plugin merging (this is factored into a utility for reuse in inheritance assembly)


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178733 13f79535-47bb-0310-9956-ffa450edef68
2005-05-27 03:27:55 +00:00
John Dennis Casey d942cfe550 added null checks for everything that's in the hashCode() method, to try to avoid cryptic errors, at least until the xml validation improves.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178691 13f79535-47bb-0310-9956-ffa450edef68
2005-05-26 21:12:06 +00:00
Brett Leslie Porter 84269d34fa PR: MNG-359
Allow .. in module names to support a flat layout for eclipse


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178621 13f79535-47bb-0310-9956-ffa450edef68
2005-05-26 08:40:05 +00:00
Brett Leslie Porter 47bc2425db add a null check in the case where there is no parent and no version - validation will pick that up later
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178603 13f79535-47bb-0310-9956-ffa450edef68
2005-05-26 06:03:38 +00:00
Brett Leslie Porter 5e14491f59 use directory scanner and a sane file copy routine to avoid reading the whole thing into memory first
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178602 13f79535-47bb-0310-9956-ffa450edef68
2005-05-26 06:03:11 +00:00
Brett Leslie Porter fd49b1e857 remove default excludes, the directory scanner has it built in
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178571 13f79535-47bb-0310-9956-ffa450edef68
2005-05-26 03:08:27 +00:00
Brett Leslie Porter a6c8cdb2ea remove unneeded parameter
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178564 13f79535-47bb-0310-9956-ffa450edef68
2005-05-26 01:27:37 +00:00
Brett Leslie Porter d408365aea use resources directory instead
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178561 13f79535-47bb-0310-9956-ffa450edef68
2005-05-26 01:03:08 +00:00
Brett Leslie Porter dc01cea9f8 move css to resources
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178558 13f79535-47bb-0310-9956-ffa450edef68
2005-05-26 00:56:32 +00:00
Brett Leslie Porter a52a917c16 add xsd to resources
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178557 13f79535-47bb-0310-9956-ffa450edef68
2005-05-26 00:54:46 +00:00
John Dennis Casey b8042e780d git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178545 13f79535-47bb-0310-9956-ffa450edef68 2005-05-25 22:51:13 +00:00
Jason van Zyl 9401fbb6b0 git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178538 13f79535-47bb-0310-9956-ffa450edef68 2005-05-25 21:57:20 +00:00
Jason van Zyl cf1e4bb689 o page for emm to look at
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178537 13f79535-47bb-0310-9956-ffa450edef68
2005-05-25 21:56:08 +00:00
Emmanuel Venisse 23374f9956 Upgrade to new version of plexus-compiler-javac
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178531 13f79535-47bb-0310-9956-ffa450edef68
2005-05-25 20:17:22 +00:00
Emmanuel Venisse f3346df4b8 Rewrite scm connections
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178416 13f79535-47bb-0310-9956-ffa450edef68
2005-05-25 09:36:20 +00:00
Emmanuel Venisse 82a6d51998 Rewrite scm tag part in project file in prepare release phase.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178323 13f79535-47bb-0310-9956-ffa450edef68
2005-05-24 23:35:00 +00:00
Emmanuel Venisse 551ab886d7 Add tag to scm part
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178317 13f79535-47bb-0310-9956-ffa450edef68
2005-05-24 23:24:30 +00:00
Emmanuel Venisse 8eb97c2ac9 Fix tag creation. We need to store in release.properties the tag choose by user
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178310 13f79535-47bb-0310-9956-ffa450edef68
2005-05-24 22:52:55 +00:00
Brett Leslie Porter ba2f6ce87a hasArgs was the culprit
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178058 13f79535-47bb-0310-9956-ffa450edef68
2005-05-24 00:46:54 +00:00
Brett Leslie Porter 47cf3a81f4 cli 1.0 is broken - on linux, empty vars occur and it checks up the arg list as part of -D arguments
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178056 13f79535-47bb-0310-9956-ffa450edef68
2005-05-23 23:49:52 +00:00
Brett Leslie Porter 6ac1d85984 fix properties file basedir
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178051 13f79535-47bb-0310-9956-ffa450edef68
2005-05-23 23:00:20 +00:00
Emmanuel Venisse f5519934fd git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178042 13f79535-47bb-0310-9956-ffa450edef68 2005-05-23 21:55:54 +00:00
Emmanuel Venisse e166284580 Add more debug trace
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178034 13f79535-47bb-0310-9956-ffa450edef68
2005-05-23 21:27:03 +00:00
Emmanuel Venisse cfb577b305 Use user.name system property as default scm user name
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178017 13f79535-47bb-0310-9956-ffa450edef68
2005-05-23 20:51:54 +00:00
Brett Leslie Porter 68595a32c2 move system property specification to system.properties in itests
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@177983 13f79535-47bb-0310-9956-ffa450edef68
2005-05-23 13:37:34 +00:00
Brett Leslie Porter e1c145bffa ignore
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@177982 13f79535-47bb-0310-9956-ffa450edef68
2005-05-23 13:34:02 +00:00
Emmanuel Venisse af40a5c6aa Use constant
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@177979 13f79535-47bb-0310-9956-ffa450edef68
2005-05-23 13:28:22 +00:00
Emmanuel Venisse 1fc2ebc7f4 Ignore pom.xml.backup and release.properties files
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@177975 13f79535-47bb-0310-9956-ffa450edef68
2005-05-23 13:21:08 +00:00