Commit Graph

90 Commits

Author SHA1 Message Date
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
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 99b5fe6d9f flesh out assemble mojo
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163603 13f79535-47bb-0310-9956-ffa450edef68
2005-03-17 23:59:07 +00:00
Brett Leslie Porter 17b770a2ab Fix NPE in later code when mavenRepoLocal was defined
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163600 13f79535-47bb-0310-9956-ffa450edef68
2005-03-17 20:20:49 +00:00
Emmanuel Venisse c86390960d Add support for proxy in bootstrap.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163596 13f79535-47bb-0310-9956-ffa450edef68
2005-03-17 06:11:17 +00:00
Brett Leslie Porter e32b20b5cf make debug bootstrap work
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163585 13f79535-47bb-0310-9956-ffa450edef68
2005-03-16 23:17:38 +00:00
Brett Leslie Porter d880a9520a put plugins in the right place
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163580 13f79535-47bb-0310-9956-ffa450edef68
2005-03-16 06:55:36 +00:00
John Dennis Casey e9a9323812 o Changed maven-user-model/UserModel/UserModelBuilder to maven-settings/MavenSettings/MavenSettingsBuilder.
This supports a change to a simpler local configuration file (~/.m2/settings.xml by default), which has the general format of:

<settings>
  <profiles>
    <profile>
      <active>true</active> <!-- not needed if this is the only profile -->
      <localRepository>/path/to/repo</localRepository>
    </profile>
    .
    .
    .
  </profiles>
  <servers>
    <server>
      <id>myserver</id>
      <username>me</username>
      <password>mypass</password>
      <privateKey>/path/to/key</privateKey>
      <passphrase>key-passphrase</passphrase>
    </server>
    .
    .
    .
  </servers>
  <proxies>
    <proxy>
      <active>true</active> <!-- not needed if this is the only proxy -->
      .
      .
      .
    </proxy>
    .
    .
    .
  </proxies>
</settings>

o Added special parameter named '#settings' which simply injects the current MavenSettings from the MavenSession into the request parameters.
o Adjusted the it-verifier and mboot2 accordingly.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163578 13f79535-47bb-0310-9956-ffa450edef68
2005-03-16 06:29:35 +00:00
John Dennis Casey ea6124092c o Removed maven-it-support from build-list (creeped in during testing).
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163559 13f79535-47bb-0310-9956-ffa450edef68
2005-03-15 21:44:22 +00:00
John Dennis Casey a0365bc54f o Added file-based test reporting to mboot process, since console reporter doesn't do a good job with test failures/errors.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163556 13f79535-47bb-0310-9956-ffa450edef68
2005-03-15 21:35:06 +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
John Dennis Casey 5dc8cb4f33 o Added default of ~/.m2/repository for users who don't have ~/.m2/user.xml specified.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163519 13f79535-47bb-0310-9956-ffa450edef68
2005-03-10 16:35:04 +00:00
Emmanuel Venisse f453edbd30 Install missing pom
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163512 13f79535-47bb-0310-9956-ffa450edef68
2005-03-10 07:35:38 +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 8d74f0acc4 o Added user.xml as the central point of config for local repository, both in MBoot2 and maven proper.
o Added proxy-profile support to user.xml


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163510 13f79535-47bb-0310-9956-ffa450edef68
2005-03-09 22:13:07 +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
John Dennis Casey 77d3e6c5f5 o Added (pom|project)? to the eval pattern in the regex param extractor, to trim ${project.artifactid} to mean the same as ${artifactId} within the pom.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163490 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 06:06:22 +00:00
John Dennis Casey 2513cb25aa o Added <pluginManagement/>
o Removed goal decoration.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163468 13f79535-47bb-0310-9956-ffa450edef68
2005-03-07 19:03:19 +00:00
Emmanuel Venisse 323eecfc57 - Externalize archiver methods
- Update JarMojo
- Implements WarMojo (Not tested yet)


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163458 13f79535-47bb-0310-9956-ffa450edef68
2005-03-05 14:52:12 +00:00
John Dennis Casey dfbae27c44 o Added first-pass logging and event-monitoring impls. Converted all System.out calls in maven-component plugins to use logger.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163457 13f79535-47bb-0310-9956-ffa450edef68
2005-03-04 09:04:26 +00:00
Emmanuel Venisse 4d67c57d74 Initialization of war plugin.
It doesn't work but don't break ci.sh and it's for Brett debugging.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163449 13f79535-47bb-0310-9956-ffa450edef68
2005-03-03 09:04:36 +00:00
Emmanuel Venisse f57388bd2a Fix artifact download for artifact type different of jar
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163448 13f79535-47bb-0310-9956-ffa450edef68
2005-03-02 13:40:00 +00:00
John Dennis Casey 95d01ff572 o Completed marmalade-mojo support, tested with m2 bootstrap with empty local repo and maven-core pegged at 2/26/2005.
Will resolve CI issues as soon as lifecycle is fixed for IT0013.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163430 13f79535-47bb-0310-9956-ffa450edef68
2005-02-28 18:29:47 +00:00
Brett Leslie Porter 6aed331a91 mboot needed to be smarter about its parsing - was picking up <version> from anywhere
removed unused "local" parsing


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163426 13f79535-47bb-0310-9956-ffa450edef68
2005-02-27 23:30:07 +00:00
John Dennis Casey db65155072 o Working on getting it0015 (marmalade-mojo support) working...nearly there, it0015 is still disabled.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163415 13f79535-47bb-0310-9956-ffa450edef68
2005-02-25 05:09:14 +00:00
Brett Leslie Porter f3fce5f156 omit evil dependencies that are killing CI
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163409 13f79535-47bb-0310-9956-ffa450edef68
2005-02-24 07:53:01 +00:00
John Dennis Casey ec28b6ed8f o Adding xpp3 to the inclusions into ${maven.home}/lib to hopefully satisfy the plexus-marmalade-factory
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163407 13f79535-47bb-0310-9956-ffa450edef68
2005-02-24 05:34:14 +00:00
John Dennis Casey 52de04e862 Retrying commit after updating maven-core to HEAD.
o Fixed problems with plugin-plugin (had to do with refactored plugin-tools stuff)
o Added marmalade-mojo support, although without an integration test (verified it doesn't get in the way of 'normal' functionality, though)
o Added code in mboot2 to copy marmalade-mojo support libs to ${maven.home}/lib


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163405 13f79535-47bb-0310-9956-ffa450edef68
2005-02-24 05:12:30 +00:00
John Dennis Casey e3a52cbb18 o Changed dependency on classworlds back to 1.1-SNAPSHOT
o Added line to put maven-plugin-tools POM in the repo during bootstrap.
o Fixed bootstrap.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163370 13f79535-47bb-0310-9956-ffa450edef68
2005-02-20 17:50:05 +00:00
John Dennis Casey 98002718c3 o Refactored mojo/plugin generation, extraction, etc. to accommodate multiple mojo languages.
o Tested with java mojos, mboot to verify nothing broken by refactor.
o TODO: Add marmalade support tests...currently only java-mojos are supported in mboot2, so this isn't going to interrupt things.
o TODO: Once marmalade support is tested, add to the list of artifacts built by mboot2.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163369 13f79535-47bb-0310-9956-ffa450edef68
2005-02-20 16:25:22 +00:00
Emmanuel Venisse 039c3c0c9c Add a little deploy plugin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163364 13f79535-47bb-0310-9956-ffa450edef68
2005-02-18 14:32:27 +00:00
Carlos Sanchez Gonzalez 763811d0fa Added debug option to compiler configuration.
Copied compiler classes from plexus compiler.
Allow bootstrapping with debug info.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163301 13f79535-47bb-0310-9956-ffa450edef68
2005-01-09 22:38:43 +00:00
Jason van Zyl 754feeadb3 *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163257 13f79535-47bb-0310-9956-ffa450edef68
2004-12-23 23:46:42 +00:00
Emmanuel Venisse 6064280bb1 Use $JAVA_HOME for javac and jar command instead of version in $PATH
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163252 13f79535-47bb-0310-9956-ffa450edef68
2004-12-15 13:23:43 +00:00
Emmanuel Venisse 1e15d3978a Fix mboot build.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163243 13f79535-47bb-0310-9956-ffa450edef68
2004-12-06 10:46:36 +00:00
Jason van Zyl 51b8ce4f65 o just packaging up stuff better, removing unused code.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163237 13f79535-47bb-0310-9956-ffa450edef68
2004-12-05 04:12:25 +00:00
Jason van Zyl 275f002ac9 o updating to the latest wagon snapshots
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163221 13f79535-47bb-0310-9956-ffa450edef68
2004-10-26 00:42:32 +00:00
Jason van Zyl 0d2848002d o removal of xpp3 as a dependency
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163220 13f79535-47bb-0310-9956-ffa450edef68
2004-10-25 14:22:51 +00:00
Jason van Zyl e48ea54902 o complete removal of xstream as a dependency
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163212 13f79535-47bb-0310-9956-ffa450edef68
2004-10-24 18:13:22 +00:00
Jason van Zyl f574221eb2 o we are now sharing the xml util code from plexus utils, modello
needs this code.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163205 13f79535-47bb-0310-9956-ffa450edef68
2004-10-23 17:20:30 +00:00
Jason van Zyl 21d7ed946d o update for the api/impl separation in Plexus
o make the runtime setup the same as what the Plexus runtime does which
  is to put classworlds in a separate directory as to simplify the
  directive to include all the core JARs: one line as opposed to having
  to list all the dependencies.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163199 13f79535-47bb-0310-9956-ffa450edef68
2004-10-23 13:31:15 +00:00
Jason van Zyl 8da840e736 o adding a POM for the new mboot stuff
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163197 13f79535-47bb-0310-9956-ffa450edef68
2004-10-21 16:08:28 +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
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 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