Commit Graph

182 Commits

Author SHA1 Message Date
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 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 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 8e9ec9c892 move log to AbstractPlugin, out of request. Request now contains only parameters (will move to fields) and marmalade context (can move to marmalade mojo wrapper)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163622 13f79535-47bb-0310-9956-ffa450edef68
2005-03-21 00:07:39 +00:00
Carlos Sanchez Gonzalez 6e21de0ed2 Moved to sandbox
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163620 13f79535-47bb-0310-9956-ffa450edef68
2005-03-20 17:03:53 +00:00
Brett Leslie Porter 82d693b967 add zip, jar, and some notes
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163613 13f79535-47bb-0310-9956-ffa450edef68
2005-03-18 12:36:49 +00:00
Brett Leslie Porter df6e78a104 work around issue
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163606 13f79535-47bb-0310-9956-ffa450edef68
2005-03-18 01:14:11 +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
Carlos Sanchez Gonzalez 75951aa79d Mojo to manage repository
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163599 13f79535-47bb-0310-9956-ffa450edef68
2005-03-17 15:02:46 +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
Brett Leslie Porter 2f89f1e94d handle POMs correctly
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163568 13f79535-47bb-0310-9956-ffa450edef68
2005-03-16 01:27:37 +00:00
Brett Leslie Porter 39e571068d handle POM properly
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163567 13f79535-47bb-0310-9956-ffa450edef68
2005-03-16 01:26:32 +00:00
Brett Leslie Porter 0f42ee716d updated to match deploy plugin, until it can be removed
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163566 13f79535-47bb-0310-9956-ffa450edef68
2005-03-16 01:19:19 +00:00
Brett Leslie Porter 5c1f5b1e57 PR: MNG-52
change type of maven plugins to "maven-plugin" instead of plugin.
This should allow other products to have different plugin types, if necessary.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163562 13f79535-47bb-0310-9956-ffa450edef68
2005-03-15 22:31:54 +00:00
John Dennis Casey 4d1ca8da33 o Removed AuthenticationInfoProvider stuff
o Added ArtifactRepositoryFactory stuff to construct with AuthenticationInfo if possible.
o Added UserModelBuilder stuff for componentizing UserModel construction.
  -> DefaultUserModelBuilder has a configuration point 'userModelPath' which can redirect where it reads user.xml from (${user.home} is substitutable here).
o Added warning message to deployment plugin when deployment repo has no authentication info available.
o Added warning message for repos with null <id/> (auth info cannot be assigned here).
o Added a couple of debug-level messages for aid in debugging repo- and userModel-related problems.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163558 13f79535-47bb-0310-9956-ffa450edef68
2005-03-15 21:41:06 +00:00
Brett Leslie Porter ba06a10501 some clean up
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163552 13f79535-47bb-0310-9956-ffa450edef68
2005-03-15 02:50:58 +00:00
Brett Leslie Porter 9fb34fca1b remove test inclusion
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163551 13f79535-47bb-0310-9956-ffa450edef68
2005-03-14 23:32:56 +00:00
Brett Leslie Porter c1d51c88c1 Initial revision
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163540 13f79535-47bb-0310-9956-ffa450edef68
2005-03-13 01:37:58 +00:00
Brett Leslie Porter c6978405cf add source and target
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163535 13f79535-47bb-0310-9956-ffa450edef68
2005-03-12 06:10:37 +00:00
Emmanuel Venisse f83e267925 Roll back debug changes
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163521 13f79535-47bb-0310-9956-ffa450edef68
2005-03-10 17:16:23 +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
Emmanuel Venisse dd2d1738a7 Remove todo. Properties doesn't exists on dependencies now.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163518 13f79535-47bb-0310-9956-ffa450edef68
2005-03-10 09:53:47 +00:00
Emmanuel Venisse abbecd7c82 Remove unused classes.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163516 13f79535-47bb-0310-9956-ffa450edef68
2005-03-10 09:37:44 +00:00
Emmanuel Venisse de167c3e10 Add Package in manifest from plugin configuration.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163515 13f79535-47bb-0310-9956-ffa450edef68
2005-03-10 09:36:44 +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
Emmanuel Venisse a90ea9bc76 Add dependencies in war and add support of scope deps
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163502 13f79535-47bb-0310-9956-ffa450edef68
2005-03-09 06:45:33 +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
Brett Leslie Porter 1fe8c76a3d move all artifact creation to artifact factory - further refactoring planned
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163499 13f79535-47bb-0310-9956-ffa450edef68
2005-03-09 02:39:10 +00:00
Brett Leslie Porter 6c23c73b8d error handling on pom:deploy
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163497 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 18:35:00 +00:00
Brett Leslie Porter 24a8a801e9 make pom:deploy work
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163495 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 06:58:27 +00:00
Emmanuel Venisse c25b897413 Fix integration tests
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163493 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 06:39:50 +00:00
Brett Leslie Porter 8d604a1088 scoping
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163491 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 06:19:59 +00:00
Brett Leslie Porter 1d615cd239 turn on logging, resolve some issues surrounding test dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163473 13f79535-47bb-0310-9956-ffa450edef68
2005-03-07 23:02:43 +00:00
Brett Leslie Porter d514fff118 clean up
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163472 13f79535-47bb-0310-9956-ffa450edef68
2005-03-07 22:08:23 +00:00
Emmanuel Venisse 482684e3cc Initial version of war plugin.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163471 13f79535-47bb-0310-9956-ffa450edef68
2005-03-07 21:46:14 +00:00
Brett Leslie Porter 47da41f68e refactor source roots to be lists
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163470 13f79535-47bb-0310-9956-ffa450edef68
2005-03-07 20:56:23 +00:00
Brett Leslie Porter 72a993eea1 remove old code related to the previous goal structure
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163469 13f79535-47bb-0310-9956-ffa450edef68
2005-03-07 19:21:38 +00:00
Brett Leslie Porter 6c36fe6f71 add basic test dependency handling
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163466 13f79535-47bb-0310-9956-ffa450edef68
2005-03-07 09:41:55 +00:00
Brett Leslie Porter 46edb7818f depedency update
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163462 13f79535-47bb-0310-9956-ffa450edef68
2005-03-07 07:23:31 +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
Brett Leslie Porter c8bd83c848 add temporary war:war as it is set as the package goal
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163452 13f79535-47bb-0310-9956-ffa450edef68
2005-03-03 11:21:57 +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
Brett Leslie Porter a44ab459bb set phase
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163428 13f79535-47bb-0310-9956-ffa450edef68
2005-02-27 23:58:41 +00:00
Brett Leslie Porter 7549992577 compile based on source roots for test mojo too
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163424 13f79535-47bb-0310-9956-ffa450edef68
2005-02-27 22:23:27 +00:00
Brett Leslie Porter 21f1cffa59 compile based on source roots
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163423 13f79535-47bb-0310-9956-ffa450edef68
2005-02-27 21:51:52 +00:00
Emmanuel Venisse f793423baf - Rewriting of jar mojo with Plexus Archiver.
- Added full features of m1 plugin


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163421 13f79535-47bb-0310-9956-ffa450edef68
2005-02-27 17:45:41 +00:00