You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2008/11/29 18:24:06 UTC
svn commit: r721694 -
/maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
Author: jvanzyl
Date: Sat Nov 29 09:24:04 2008
New Revision: 721694
URL: http://svn.apache.org/viewvc?rev=721694&view=rev
Log:
o remove the artifact handlers out of the main components file, they can be merged now. need to quickly move to the point where all component metadata for wiring is generated so that we can move toward analysis of the annotations at runtime. we also need the configuration source way of pulling in component configuration.
Modified:
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
Modified: maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=721694&r1=721693&r2=721694&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml Sat Nov 29 09:24:04 2008
@@ -19,167 +19,105 @@
<component-set>
<components>
-
- <!--
- | These are the artifacts handlers that were previously in maven-artifact and they don't belong there as these
- | are Maven specific artifact handlers. We need to put these into their respective plugins and make this fully dynamic. jvz.
- -->
-
- <component>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
- <role-hint>ejb</role-hint>
- <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
- <configuration>
- <type>ejb</type>
- <extension>jar</extension>
- <language>java</language>
- <addedToClasspath>true</addedToClasspath>
- </configuration>
- </component>
-
- <component>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
- <role-hint>jar</role-hint>
- <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
- <configuration>
- <type>jar</type>
- <language>java</language>
- <addedToClasspath>true</addedToClasspath>
- </configuration>
- </component>
-
- <component>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
- <role-hint>test-jar</role-hint>
- <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
- <configuration>
- <classifier>tests</classifier>
- <extension>jar</extension>
- <type>test-jar</type>
- <packaging>jar</packaging>
- <language>java</language>
- <addedToClasspath>true</addedToClasspath>
- </configuration>
- </component>
-
- <component>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
- <role-hint>maven-plugin</role-hint>
- <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
- <configuration>
- <type>maven-plugin</type>
- <extension>jar</extension>
- <language>java</language>
- <addedToClasspath>true</addedToClasspath>
- </configuration>
- </component>
-
- <component>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
- <role-hint>pom</role-hint>
- <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
- <configuration>
- <type>pom</type>
- </configuration>
- </component>
-
- <component>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
- <role-hint>java-source</role-hint>
- <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
- <configuration>
- <classifier>sources</classifier>
- <type>java-source</type>
- <extension>jar</extension>
- <language>java</language>
- <addedToClasspath>false</addedToClasspath>
- </configuration>
- </component>
-
- <component>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
- <role-hint>javadoc</role-hint>
- <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
- <configuration>
- <classifier>javadoc</classifier>
- <type>javadoc</type>
- <extension>jar</extension>
- <language>java</language>
- <addedToClasspath>true</addedToClasspath>
- </configuration>
- </component>
-
- <component>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
- <role-hint>war</role-hint>
- <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
- <configuration>
- <type>war</type>
- <includesDependencies>true</includesDependencies>
- <language>java</language>
- <addedToClasspath>false</addedToClasspath>
- </configuration>
- </component>
-
- <component>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
- <role-hint>ear</role-hint>
- <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
- <configuration>
- <type>ear</type>
- <includesDependencies>true</includesDependencies>
- <language>java</language>
- <addedToClasspath>false</addedToClasspath>
- </configuration>
- </component>
-
<component>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
- <role-hint>ejb-client</role-hint>
- <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
- <configuration>
- <type>ejb-client</type>
- <extension>jar</extension>
- <packaging>ejb</packaging>
- <classifier>client</classifier>
- <language>java</language>
- <addedToClasspath>true</addedToClasspath>
- </configuration>
- </component>
-
- <component>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
- <role-hint>rar</role-hint>
- <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
- <configuration>
- <type>rar</type>
- <includesDependencies>true</includesDependencies>
- <language>java</language>
- <addedToClasspath>false</addedToClasspath>
- </configuration>
- </component>
-
- <component>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
- <role-hint>par</role-hint>
- <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
- <configuration>
- <type>par</type>
- <includesDependencies>true</includesDependencies>
- <language>java</language>
- <addedToClasspath>false</addedToClasspath>
- </configuration>
- </component>
-
- <component>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
- <role-hint>ejb3</role-hint>
- <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
+ <role>org.apache.maven.lifecycle.binding.LifecycleBindingManager</role>
+ <role-hint>default</role-hint>
+ <implementation>org.apache.maven.lifecycle.binding.DefaultLifecycleBindingManager</implementation>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.plugin.loader.PluginLoader</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.lifecycle.LifecycleBindingLoader</role>
+ <field-name>bindingsByPackaging</field-name>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+ <field-name>legacyMappingsByPackaging</field-name>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.lifecycle.binding.MojoBindingFactory</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.lifecycle.binding.LegacyLifecycleMappingParser</role>
+ </requirement>
+ <requirement>
+ <role>org.codehaus.plexus.PlexusContainer</role>
+ <role-hint>default</role-hint>
+ <field-name>container</field-name>
+ </requirement>
+ </requirements>
<configuration>
- <type>ejb3</type>
- <includesDependencies>true</includesDependencies>
- <language>java</language>
- <addedToClasspath>false</addedToClasspath>
+ <lifecycles>
+ <lifecycle>
+ <id>default</id>
+ <!-- START SNIPPET: lifecycle -->
+ <phases>
+ <phase>validate</phase>
+ <phase>initialize</phase>
+ <phase>generate-sources</phase>
+ <phase>process-sources</phase>
+ <phase>generate-resources</phase>
+ <phase>process-resources</phase>
+ <phase>compile</phase>
+ <phase>process-classes</phase>
+ <phase>generate-test-sources</phase>
+ <phase>process-test-sources</phase>
+ <phase>generate-test-resources</phase>
+ <phase>process-test-resources</phase>
+ <phase>test-compile</phase>
+ <phase>process-test-classes</phase>
+ <phase>test</phase>
+ <phase>prepare-package</phase>
+ <phase>package</phase>
+ <phase>pre-integration-test</phase>
+ <phase>integration-test</phase>
+ <phase>post-integration-test</phase>
+ <phase>verify</phase>
+ <phase>install</phase>
+ <phase>deploy</phase>
+ </phases>
+ <!-- END SNIPPET: lifecycle -->
+ </lifecycle>
+ <lifecycle>
+ <id>clean</id>
+ <phases>
+ <phase>pre-clean</phase>
+ <phase>clean</phase>
+ <phase>post-clean</phase>
+ </phases>
+ <default-phases>
+ <clean>org.apache.maven.plugins:maven-clean-plugin:clean</clean>
+ </default-phases>
+ </lifecycle>
+ <lifecycle>
+ <id>site</id>
+ <phases>
+ <phase>pre-site</phase>
+ <phase>site</phase>
+ <phase>post-site</phase>
+ <phase>site-deploy</phase>
+ </phases>
+ <default-phases>
+ <site>org.apache.maven.plugins:maven-site-plugin:site</site>
+ <site-deploy>org.apache.maven.plugins:maven-site-plugin:deploy</site-deploy>
+ </default-phases>
+ </lifecycle>
+ </lifecycles>
+ <!-- START SNIPPET: default-reports -->
+ <defaultReports>
+ <report>org.apache.maven.plugins:maven-project-info-reports-plugin:2.0.1</report>
+ <!-- TODO: currently in mojo - should they be defaults any more?
+ <report>org.apache.maven.plugins:maven-checkstyle-plugin</report>
+ <report>org.apache.maven.plugins:maven-javadoc-plugin</report>
+ <report>org.apache.maven.plugins:maven-changelog-plugin</report>
+ <report>org.apache.maven.plugins:maven-surefire-report-plugin</report>
+ <report>org.apache.maven.plugins:maven-jdepend-plugin</report>
+ <report>org.apache.maven.plugins:maven-jxr-plugin</report>
+ <report>org.apache.maven.plugins:maven-taglist-plugin</report>
+ -->
+ </defaultReports>
+ <!-- END SNIPPET: default-reports -->
</configuration>
</component>
@@ -424,107 +362,5 @@
<!-- END SNIPPET: ejb3-lifecycle -->
</configuration>
</component>
-
- <component>
- <role>org.apache.maven.lifecycle.binding.LifecycleBindingManager</role>
- <role-hint>default</role-hint>
- <implementation>org.apache.maven.lifecycle.binding.DefaultLifecycleBindingManager</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.plugin.loader.PluginLoader</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.lifecycle.LifecycleBindingLoader</role>
- <field-name>bindingsByPackaging</field-name>
- </requirement>
- <requirement>
- <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
- <field-name>legacyMappingsByPackaging</field-name>
- </requirement>
- <requirement>
- <role>org.apache.maven.lifecycle.binding.MojoBindingFactory</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.lifecycle.binding.LegacyLifecycleMappingParser</role>
- </requirement>
- <requirement>
- <role>org.codehaus.plexus.PlexusContainer</role>
- <role-hint>default</role-hint>
- <field-name>container</field-name>
- </requirement>
- </requirements>
- <configuration>
- <lifecycles>
- <lifecycle>
- <id>default</id>
- <!-- START SNIPPET: lifecycle -->
- <phases>
- <phase>validate</phase>
- <phase>initialize</phase>
- <phase>generate-sources</phase>
- <phase>process-sources</phase>
- <phase>generate-resources</phase>
- <phase>process-resources</phase>
- <phase>compile</phase>
- <phase>process-classes</phase>
- <phase>generate-test-sources</phase>
- <phase>process-test-sources</phase>
- <phase>generate-test-resources</phase>
- <phase>process-test-resources</phase>
- <phase>test-compile</phase>
- <phase>process-test-classes</phase>
- <phase>test</phase>
- <phase>prepare-package</phase>
- <phase>package</phase>
- <phase>pre-integration-test</phase>
- <phase>integration-test</phase>
- <phase>post-integration-test</phase>
- <phase>verify</phase>
- <phase>install</phase>
- <phase>deploy</phase>
- </phases>
- <!-- END SNIPPET: lifecycle -->
- </lifecycle>
- <lifecycle>
- <id>clean</id>
- <phases>
- <phase>pre-clean</phase>
- <phase>clean</phase>
- <phase>post-clean</phase>
- </phases>
- <default-phases>
- <clean>org.apache.maven.plugins:maven-clean-plugin:clean</clean>
- </default-phases>
- </lifecycle>
- <lifecycle>
- <id>site</id>
- <phases>
- <phase>pre-site</phase>
- <phase>site</phase>
- <phase>post-site</phase>
- <phase>site-deploy</phase>
- </phases>
- <default-phases>
- <site>org.apache.maven.plugins:maven-site-plugin:site</site>
- <site-deploy>org.apache.maven.plugins:maven-site-plugin:deploy</site-deploy>
- </default-phases>
- </lifecycle>
- </lifecycles>
- <!-- START SNIPPET: default-reports -->
- <defaultReports>
- <report>org.apache.maven.plugins:maven-project-info-reports-plugin:2.0.1</report>
- <!-- TODO: currently in mojo - should they be defaults any more?
- <report>org.apache.maven.plugins:maven-checkstyle-plugin</report>
- <report>org.apache.maven.plugins:maven-javadoc-plugin</report>
- <report>org.apache.maven.plugins:maven-changelog-plugin</report>
- <report>org.apache.maven.plugins:maven-surefire-report-plugin</report>
- <report>org.apache.maven.plugins:maven-jdepend-plugin</report>
- <report>org.apache.maven.plugins:maven-jxr-plugin</report>
- <report>org.apache.maven.plugins:maven-taglist-plugin</report>
- -->
- </defaultReports>
- <!-- END SNIPPET: default-reports -->
- </configuration>
- </component>
</components>
</component-set>