Author: brett
Date: Wed Oct 19 11:03:56 2005
New Revision: 326624
URL: http://svn.apache.org/viewcvs?rev=326624&view=rev
Log:
update components and sample script
Modified:
maven/components/tags/maven-2.0/maven-artifact-ant/sample.build.xml
maven/components/tags/maven-2.0/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml
Modified: maven/components/tags/maven-2.0/maven-artifact-ant/sample.build.xml
URL:
http://svn.apache.org/viewcvs/maven/components/tags/maven-2.0/maven-artifact-ant/sample.build.xml?rev=326624&r1=326623&r2=326624&view=diff
==============================================================================
--- maven/components/tags/maven-2.0/maven-artifact-ant/sample.build.xml
(original)
+++ maven/components/tags/maven-2.0/maven-artifact-ant/sample.build.xml Wed Oct
19 11:03:56 2005
@@ -23,7 +23,7 @@
<target name="initTaskDefs">
<!-- don't forget to update the version! -->
<path id="maven.classpath">
- <pathelement
location="target/maven-artifact-ant-2.0-beta-4-SNAPSHOT-dep.jar"/>
+ <pathelement location="target/maven-artifact-ant-2.0-dep.jar"/>
</path>
<typedef resource="org/apache/maven/artifact/ant/antlib.xml"
uri="urn:maven-artifact-ant">
Modified:
maven/components/tags/maven-2.0/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewcvs/maven/components/tags/maven-2.0/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml?rev=326624&r1=326623&r2=326624&view=diff
==============================================================================
---
maven/components/tags/maven-2.0/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/components/tags/maven-2.0/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml
Wed Oct 19 11:03:56 2005
@@ -1,125 +1,16 @@
<component-set>
<components>
<component>
-
<role>org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout</role>
- <role-hint>default</role-hint>
-
<implementation>org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout</implementation>
- </component>
-
- <component>
-
<role>org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout</role>
- <role-hint>legacy</role-hint>
-
<implementation>org.apache.maven.artifact.repository.layout.LegacyRepositoryLayout</implementation>
- </component>
-
- <!--
- |
- | ArtifactHandlerManager
- |
- -->
- <component>
-
<role>org.apache.maven.artifact.handler.manager.ArtifactHandlerManager</role>
-
<implementation>org.apache.maven.artifact.handler.manager.DefaultArtifactHandlerManager</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
- <field-name>artifactHandlers</field-name>
- </requirement>
- </requirements>
- </component>
-
- <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>
- </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>
- </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>
- </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>
- <type>java-source</type>
- <extension>jar</extension>
- </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>
- </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>
- </configuration>
- </component>
-
- <component>
- <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
-
<implementation>org.apache.maven.artifact.factory.DefaultArtifactFactory</implementation>
+ <role>org.apache.maven.artifact.manager.WagonManager</role>
+
<implementation>org.apache.maven.artifact.ant.CustomWagonManager</implementation>
<requirements>
<requirement>
-
<role>org.apache.maven.artifact.handler.manager.ArtifactHandlerManager</role>
+
<role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
</requirement>
</requirements>
</component>
-
- <component>
-
<role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
-
<implementation>org.apache.maven.artifact.repository.DefaultArtifactRepositoryFactory</implementation>
- </component>
-
- <component>
- <role>org.apache.maven.artifact.resolver.ArtifactCollector</role>
-
<implementation>org.apache.maven.artifact.resolver.DefaultArtifactCollector</implementation>
- </component>
-
<component>
<role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
- <role-hint>default</role-hint>
<implementation>org.apache.maven.artifact.repository.metadata.DefaultRepositoryMetadataManager</implementation>
<requirements>
<requirement>
@@ -127,30 +18,6 @@
</requirement>
</requirements>
</component>
-
- <!--
- |
- | WagonManager
- |
- -->
- <component>
- <role>org.apache.maven.artifact.manager.WagonManager</role>
-
<implementation>org.apache.maven.artifact.ant.CustomWagonManager</implementation>
- <!--
-
<implementation>org.apache.maven.artifact.manager.DefaultWagonManager</implementation>
- -->
- <requirements>
- <requirement>
-
<role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
- </requirement>
- </requirements>
- </component>
-
- <!--
- |
- | Transformations
- |
- -->
<component>
<role>org.apache.maven.artifact.transform.ArtifactTransformation</role>
<role-hint>snapshot</role-hint>
@@ -164,7 +31,6 @@
</requirement>
</requirements>
</component>
-
<component>
<role>org.apache.maven.artifact.transform.ArtifactTransformation</role>
<role-hint>release</role-hint>
@@ -178,7 +44,6 @@
</requirement>
</requirements>
</component>
-
<component>
<role>org.apache.maven.artifact.transform.ArtifactTransformation</role>
<role-hint>latest</role-hint>
@@ -192,12 +57,6 @@
</requirement>
</requirements>
</component>
-
- <!--
- |
- | ArtifactTransformationManager
- |
- -->
<component>
<role>org.apache.maven.artifact.transform.ArtifactTransformationManager</role>
<implementation>org.apache.maven.artifact.transform.DefaultArtifactTransformationManager</implementation>
@@ -208,12 +67,6 @@
</requirement>
</requirements>
</component>
-
- <!--
- |
- | Resolver
- |
- -->
<component>
<role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
<implementation>org.apache.maven.artifact.resolver.DefaultArtifactResolver</implementation>
@@ -232,12 +85,6 @@
</requirement>
</requirements>
</component>
-
- <!--
- |
- | ArtifactInstaller
- |
- -->
<component>
<role>org.apache.maven.artifact.installer.ArtifactInstaller</role>
<implementation>org.apache.maven.artifact.installer.DefaultArtifactInstaller</implementation>
@@ -250,12 +97,6 @@
</requirement>
</requirements>
</component>
-
- <!--
- |
- | ArtifactDeployer
- |
- -->
<component>
<role>org.apache.maven.artifact.deployer.ArtifactDeployer</role>
<implementation>org.apache.maven.artifact.deployer.DefaultArtifactDeployer</implementation>
@@ -271,68 +112,213 @@
</requirement>
</requirements>
</component>
-
<component>
<role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
<implementation>org.apache.maven.artifact.repository.DefaultArtifactRepositoryFactory</implementation>
</component>
-
- <!--
- |
- |
- |
- -->
+ <component>
+
<role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataBuilder</role>
+ <role-hint>default</role-hint>
+
<implementation>org.apache.maven.artifact.repository.metadata.DefaultRepositoryMetadataBuilder</implementation>
+ <requirements>
+ <requirement>
+
<role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+ <role>org.apache.maven.usability.diagnostics.ErrorDiagnostics</role>
+
<implementation>org.apache.maven.usability.diagnostics.ErrorDiagnostics</implementation>
+ </component>
+ <component>
+ <role>org.apache.maven.settings.MavenSettingsBuilder</role>
+
<implementation>org.apache.maven.settings.DefaultMavenSettingsBuilder</implementation>
+ <configuration>
+
<globalSettingsPath>${maven.home}/conf/settings.xml</globalSettingsPath>
+ <userSettingsPath>${user.home}/.m2/settings.xml</userSettingsPath>
+ </configuration>
+ </component>
<component>
<role>org.apache.maven.profiles.MavenProfilesBuilder</role>
<implementation>org.apache.maven.profiles.DefaultMavenProfilesBuilder</implementation>
</component>
-
- <!--
- |
- |
- |
- -->
<component>
- <role>org.apache.maven.project.MavenProjectHelper</role>
-
<implementation>org.apache.maven.project.DefaultMavenProjectHelper</implementation>
+ <role>org.apache.maven.wagon.Wagon</role>
+ <role-hint>http</role-hint>
+
<implementation>org.apache.maven.wagon.providers.http.LightweightHttpWagon</implementation>
+ <instantiation-strategy>per-lookup</instantiation-strategy>
+ </component>
+ <component>
+ <role>org.apache.maven.wagon.Wagon</role>
+ <role-hint>https</role-hint>
+
<implementation>org.apache.maven.wagon.providers.http.LightweightHttpWagon</implementation>
+ <instantiation-strategy>per-lookup</instantiation-strategy>
+ </component>
+ <component>
+ <role>org.apache.maven.wagon.Wagon</role>
+ <role-hint>file</role-hint>
+
<implementation>org.apache.maven.wagon.providers.file.FileWagon</implementation>
+ <instantiation-strategy>per-lookup</instantiation-strategy>
+ </component>
+ <component>
+
<role>org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout</role>
+ <role-hint>default</role-hint>
+
<implementation>org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout</implementation>
+ </component>
+ <component>
+
<role>org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout</role>
+ <role-hint>legacy</role-hint>
+
<implementation>org.apache.maven.artifact.repository.layout.LegacyRepositoryLayout</implementation>
+ </component>
+ <component>
+
<role>org.apache.maven.artifact.handler.manager.ArtifactHandlerManager</role>
+
<implementation>org.apache.maven.artifact.handler.manager.DefaultArtifactHandlerManager</implementation>
<requirements>
<requirement>
- <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+ <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+ <field-name>artifactHandlers</field-name>
+ </requirement>
+ </requirements>
+ </component>
+ <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>
+ <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>
+ <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.factory.ArtifactFactory</role>
+
<implementation>org.apache.maven.artifact.factory.DefaultArtifactFactory</implementation>
+ <requirements>
+ <requirement>
+
<role>org.apache.maven.artifact.handler.manager.ArtifactHandlerManager</role>
</requirement>
</requirements>
</component>
- <!--
- |
- |
- |
- -->
+ <component>
+ <role>org.apache.maven.artifact.resolver.ArtifactCollector</role>
+
<implementation>org.apache.maven.artifact.resolver.DefaultArtifactCollector</implementation>
+ </component>
+ <component>
+ <role>org.apache.maven.project.MavenProjectHelper</role>
+
<implementation>org.apache.maven.project.DefaultMavenProjectHelper</implementation>
+ </component>
<component>
<role>org.apache.maven.project.interpolation.ModelInterpolator</role>
<implementation>org.apache.maven.project.interpolation.RegexBasedModelInterpolator</implementation>
</component>
- <!--
- |
- |
- |
- -->
<component>
<role>org.apache.maven.project.injection.ModelDefaultsInjector</role>
<implementation>org.apache.maven.project.injection.DefaultModelDefaultsInjector</implementation>
</component>
- <!--
- |
- |
- |
- -->
<component>
<role>org.apache.maven.project.injection.ProfileInjector</role>
<implementation>org.apache.maven.project.injection.DefaultProfileInjector</implementation>
</component>
- <!--
- |
- |
- |
- -->
<component>
<role>org.apache.maven.project.MavenProjectBuilder</role>
<implementation>org.apache.maven.project.DefaultMavenProjectBuilder</implementation>
@@ -370,66 +356,43 @@
<requirement>
<role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
</requirement>
+ <requirement>
+ <role>org.apache.maven.artifact.manager.WagonManager</role>
+ </requirement>
</requirements>
</component>
- <!--
- |
- |
- |
- -->
<component>
<role>org.apache.maven.profiles.activation.ProfileActivator</role>
<role-hint>always-on</role-hint>
<implementation>org.apache.maven.profiles.activation.AlwaysOnProfileActivator</implementation>
</component>
- <!--
- |
- |
- |
- -->
<component>
<role>org.apache.maven.profiles.activation.ProfileActivator</role>
<role-hint>jdk-prefix</role-hint>
<implementation>org.apache.maven.profiles.activation.JdkPrefixProfileActivator</implementation>
</component>
- <!--
- |
- |
- |
- -->
<component>
<role>org.apache.maven.profiles.activation.ProfileActivator</role>
<role-hint>system-property</role-hint>
<implementation>org.apache.maven.profiles.activation.SystemPropertyProfileActivator</implementation>
</component>
- <!--
- |
- |
- |
- -->
+ <component>
+ <role>org.apache.maven.profiles.activation.ProfileActivator</role>
+ <role-hint>file</role-hint>
+
<implementation>org.apache.maven.profiles.activation.FileProfileActivator</implementation>
+ </component>
<component>
<role>org.apache.maven.project.inheritance.ModelInheritanceAssembler</role>
<implementation>org.apache.maven.project.inheritance.DefaultModelInheritanceAssembler</implementation>
</component>
-
- <!--
- |
- |
- |
- -->
<component>
<role>org.apache.maven.project.validation.ModelValidator</role>
<implementation>org.apache.maven.project.validation.DefaultModelValidator</implementation>
</component>
-
- <!-- ********************* FIXME
*******************************************
- | I realize this is duplicated but allows the project builder to work by
itself
- -->
<component>
<role>org.apache.maven.project.path.PathTranslator</role>
<implementation>org.apache.maven.project.path.DefaultPathTranslator</implementation>
</component>
-
<component>
<role>org.apache.maven.project.ModelResolver</role>
<role-hint>default</role-hint>
@@ -440,7 +403,6 @@
</requirement>
</requirements>
</component>
-
<component>
<role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
<role-hint>maven</role-hint>
@@ -457,28 +419,5 @@
</requirement>
</requirements>
</component>
-
- <component>
- <role>org.apache.maven.settings.MavenSettingsBuilder</role>
-
<implementation>org.apache.maven.settings.DefaultMavenSettingsBuilder</implementation>
- <configuration>
-
<globalSettingsPath>${maven.home}/conf/settings.xml</globalSettingsPath>
- <userSettingsPath>${user.home}/.m2/settings.xml</userSettingsPath>
- </configuration>
- </component>
-
- <component>
- <role>org.apache.maven.wagon.Wagon</role>
- <role-hint>file</role-hint>
-
<implementation>org.apache.maven.wagon.providers.file.FileWagon</implementation>
- <instantiation-strategy>per-lookup</instantiation-strategy>
- </component>
-
- <component>
- <role>org.apache.maven.wagon.Wagon</role>
- <role-hint>http</role-hint>
-
<implementation>org.apache.maven.wagon.providers.http.LightweightHttpWagon</implementation>
- <instantiation-strategy>per-lookup</instantiation-strategy>
- </component>
</components>
-</component-set>
+</component-set>
\ No newline at end of file
