You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2008/09/29 22:04:32 UTC
svn commit: r700229 - in
/geronimo/gshell/trunk/gshell-support/gshell-artifact: pom.xml
src/main/resources/META-INF/plexus/components.xml
Author: jdillon
Date: Mon Sep 29 13:04:32 2008
New Revision: 700229
URL: http://svn.apache.org/viewvc?rev=700229&view=rev
Log:
Don't generate plexus descriptors, hardcode them, soon to be removed anyways
Added:
geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/resources/META-INF/plexus/components.xml (contents, props changed)
- copied, changed from r700219, geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/resources/META-INF/plexus/plexus.xml
Modified:
geronimo/gshell/trunk/gshell-support/gshell-artifact/pom.xml
Modified: geronimo/gshell/trunk/gshell-support/gshell-artifact/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact/pom.xml?rev=700229&r1=700228&r2=700229&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact/pom.xml Mon Sep 29 13:04:32 2008
@@ -102,41 +102,6 @@
<showDeprecation>false</showDeprecation>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
- <configuration>
- <extractors>
- <classComponentDescriptorExtractor>
- <gleaner implementation="org.codehaus.plexus.cdc.gleaner.AnnotationComponentGleaner"/>
- </classComponentDescriptorExtractor>
- </extractors>
- </configuration>
- <executions>
- <execution>
- <id>process-classes</id>
- <phase>process-classes</phase>
- <goals>
- <goal>descriptor</goal>
- </goals>
- </execution>
- <execution>
- <id>process-test-classes</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>test-descriptor</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-cdc-anno</artifactId>
- <version>1.0-alpha-1</version>
- </dependency>
- </dependencies>
- </plugin>
</plugins>
</build>
Copied: geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/resources/META-INF/plexus/components.xml (from r700219, geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/resources/META-INF/plexus/plexus.xml)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/resources/META-INF/plexus/components.xml?p2=geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/resources/META-INF/plexus/components.xml&p1=geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/resources/META-INF/plexus/plexus.xml&r1=700219&r2=700229&rev=700229&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/resources/META-INF/plexus/plexus.xml (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/resources/META-INF/plexus/components.xml Mon Sep 29 13:04:32 2008
@@ -20,53 +20,83 @@
<!-- $Rev$ $Date$ -->
-<plexus>
+<component-set>
<components>
- <!--
- Force our custom GShellArtifactResolver to be the default, and re-assign the default implementation as a delegate.
- -->
-
<component>
- <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
- <role-hint>default</role-hint>
- <implementation>org.apache.geronimo.gshell.artifact.GShellArtifactResolver</implementation>
+ <role>org.apache.geronimo.gshell.artifact.ArtifactManager</role>
+ <implementation>org.apache.geronimo.gshell.artifact.DefaultArtifactManager</implementation>
<isolated-realm>false</isolated-realm>
<requirements>
<requirement>
- <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
- <role-hint>delegate</role-hint>
- <field-name>delegate</field-name>
+ <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+ <field-name>artifactFactory</field-name>
</requirement>
<requirement>
<role>org.apache.geronimo.gshell.artifact.ArtifactRepositoryManager</role>
<field-name>repositoryManager</field-name>
</requirement>
+ <requirement>
+ <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
+ <field-name>artifactResolver</field-name>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
+ <role-hint>gshell</role-hint>
+ <field-name>artifactMetadataSource</field-name>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.artifact.manager.WagonManager</role>
+ <field-name>wagonManager</field-name>
+ </requirement>
</requirements>
</component>
<component>
- <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
- <role-hint>delegate</role-hint>
- <implementation>org.apache.maven.artifact.resolver.DefaultArtifactResolver</implementation>
+ <role>org.apache.geronimo.gshell.artifact.ArtifactRepositoryManager</role>
+ <implementation>org.apache.geronimo.gshell.artifact.DefaultArtifactRepositoryManager</implementation>
<isolated-realm>false</isolated-realm>
<requirements>
<requirement>
- <role>org.apache.maven.artifact.manager.WagonManager</role>
- <field-name>wagonManager</field-name>
+ <role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
+ <field-name>repositoryFactory</field-name>
+ </requirement>
+ </requirements>
+ </component>
+
+ <component>
+ <role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
+ <role-hint>gshell</role-hint>
+ <implementation>org.apache.geronimo.gshell.artifact.GShellArtifactMetadataSource</implementation>
+ <isolated-realm>false</isolated-realm>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
+ <role-hint>maven</role-hint>
+ <field-name>delegate</field-name>
</requirement>
<requirement>
- <role>org.apache.maven.artifact.transform.ArtifactTransformationManager</role>
- <field-name>transformationManager</field-name>
+ <role>org.apache.geronimo.gshell.artifact.ArtifactRepositoryManager</role>
+ <field-name>repositoryManager</field-name>
</requirement>
+ </requirements>
+ </component>
+
+ <component>
+ <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
+ <role-hint>gshell</role-hint>
+ <implementation>org.apache.geronimo.gshell.artifact.GShellArtifactResolver</implementation>
+ <isolated-realm>false</isolated-realm>
+ <requirements>
<requirement>
- <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
- <field-name>artifactFactory</field-name>
+ <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
+ <role-hint>delegate</role-hint>
+ <field-name>delegate</field-name>
</requirement>
<requirement>
- <role>org.apache.maven.artifact.resolver.ArtifactCollector</role>
- <field-name>artifactCollector</field-name>
+ <role>org.apache.geronimo.gshell.artifact.ArtifactRepositoryManager</role>
+ <field-name>repositoryManager</field-name>
</requirement>
</requirements>
</component>
</components>
-</plexus>
\ No newline at end of file
+</component-set>
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml