jvanzyl 2004/04/15 08:49:19
Modified: maven-core/src/main/resources/org/apache/maven plexus.xml
Added: maven-core/src/main/resources/META-INF/plexus components.xml
Log:
o moving more of the component defs to the discovered components.xml to make
the Maven facade component fully embeddable. It is embeddable now but you
have to do few lines programmatically which is annoying. I'll make a POJO
facade this week.
Revision Changes Path
1.1
maven-components/maven-core/src/main/resources/META-INF/plexus/components.xml
Index: components.xml
===================================================================
<component-set>
<components>
<component>
<role>org.apache.maven.Maven</role>
<implementation>org.apache.maven.DefaultMaven</implementation>
<requirements>
<requirement>
<role>org.apache.maven.plugin.manager.PluginManagerManager</role>
</requirement>
<requirement>
<role>org.apache.maven.project.MavenProjectBuilder</role>
</requirement>
<requirement>
<role>org.codehaus.plexus.i18n.I18N</role>
</requirement>
<requirement>
<role>org.apache.maven.lifecycle.MavenLifecycleManager</role>
</requirement>
</requirements>
</component>
<component>
<role>org.codehaus.plexus.i18n.I18N</role>
<implementation>org.codehaus.plexus.i18n.DefaultI18N</implementation>
<configuration>
<default-bundle-name>org.apache.maven.messages.messages</default-bundle-name>
</configuration>
</component>
<component>
<role>org.apache.maven.verifier.DependencyVerifier</role>
<implementation>org.apache.maven.verifier.DefaultDependencyVerifier</implementation>
<requirements>
<requirement>
<role>org.codehaus.plexus.i18n.I18N</role>
</requirement>
<requirement>
<role>org.apache.maven.wagon.managers.WagonManager</role>
</requirement>
</requirements>
</component>
<component>
<role>org.apache.maven.lifecycle.MavenLifecycleManager</role>
<implementation>org.apache.maven.lifecycle.DefaultMavenLifecycleManager</implementation>
<configuration>
<lifecycle-phases>
<lifecycle-phase
implementation="org.apache.maven.lifecycle.phase.DependencyResolutionPhase"/>
<lifecycle-phase
implementation="org.apache.maven.lifecycle.phase.GoalAttainmentPhase"/>
</lifecycle-phases>
</configuration>
</component>
</components>
</component-set>
1.8 +0 -78
maven-components/maven-core/src/main/resources/org/apache/maven/plexus.xml
Index: plexus.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/main/resources/org/apache/maven/plexus.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- plexus.xml 7 Apr 2004 20:00:41 -0000 1.7
+++ plexus.xml 15 Apr 2004 15:49:19 -0000 1.8
@@ -1,5 +1,4 @@
<configuration>
-
<component-discoverer-manager
implementation="org.codehaus.plexus.component.discovery.DefaultComponentDiscovererManager">
<listeners>
<listener>
@@ -10,72 +9,10 @@
<component-discoverer
implementation="org.apache.maven.plugin.plexus.discovery.MavenPluginDiscoverer"/>
</component-discoverers>
</component-discoverer-manager>
-
<resources>
<jar-repository>${maven.home}/plugins/plexus</jar-repository>
</resources>
-
<components>
- <!--
- |
- | Components used by the maven-core itself.
- |
- -->
- <component>
- <role>org.apache.maven.Maven</role>
- <implementation>org.apache.maven.DefaultMaven</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.plugin.manager.PluginManagerManager</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.project.MavenProjectBuilder</role>
- </requirement>
- <requirement>
- <role>org.codehaus.plexus.i18n.I18N</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.lifecycle.MavenLifecycleManager</role>
- </requirement>
- </requirements>
- </component>
- <component>
- <role>org.codehaus.plexus.i18n.I18N</role>
- <implementation>org.codehaus.plexus.i18n.DefaultI18N</implementation>
- <configuration>
-
<default-bundle-name>org.apache.maven.messages.messages</default-bundle-name>
- </configuration>
- </component>
- <!-- This should be moved to the artifact component -->
- <component>
- <role>org.apache.maven.verifier.DependencyVerifier</role>
-
<implementation>org.apache.maven.verifier.DefaultDependencyVerifier</implementation>
- <requirements>
- <requirement>
- <role>org.codehaus.plexus.i18n.I18N</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.wagon.managers.WagonManager</role>
- </requirement>
- </requirements>
- </component>
- <component>
- <role>org.apache.maven.lifecycle.MavenLifecycleManager</role>
-
<implementation>org.apache.maven.lifecycle.DefaultMavenLifecycleManager</implementation>
- <configuration>
- <lifecycle-phases>
- <lifecycle-phase
implementation="org.apache.maven.lifecycle.phase.DependencyResolutionPhase"/>
- <lifecycle-phase
implementation="org.apache.maven.lifecycle.phase.GoalAttainmentPhase"/>
- </lifecycle-phases>
- </configuration>
- </component>
-
- <!--
- |
- | Plugin Manager Manager
- |
- -->
-
<component>
<role>org.apache.maven.plugin.manager.PluginManagerManager</role>
<implementation>org.apache.maven.plugin.manager.DefaultPluginManagerManager</implementation>
@@ -89,45 +26,31 @@
<maven-home>${maven.home}</maven-home>
</configuration>
</component>
-
- <!--
- |
- | Plexus plugin manager
- |
- -->
-
<component>
<role>org.apache.maven.plugin.manager.PluginManager</role>
<role-hint>plexus</role-hint>
<implementation>org.apache.maven.plugin.plexus.PlexusPluginManager</implementation>
</component>
-
<component>
<role>org.apache.maven.plugin.plexus.executor.PluginExecutor</role>
<role-hint>field</role-hint>
<implementation>org.apache.maven.plugin.plexus.executor.FieldPluginExecutor</implementation>
</component>
-
<component>
<role>org.apache.maven.plugin.plexus.executor.PluginExecutor</role>
<role-hint>setter</role-hint>
<implementation>org.apache.maven.plugin.plexus.executor.SetterPluginExecutor</implementation>
</component>
-
<component>
<role>org.apache.maven.plugin.plexus.executor.PluginExecutor</role>
<role-hint>singleton</role-hint>
<implementation>org.apache.maven.plugin.plexus.executor.SingletonPluginExecutor</implementation>
</component>
-
<component>
<role>org.apache.maven.plugin.plexus.executor.PluginExecutor</role>
<role-hint>integrated</role-hint>
<implementation>org.apache.maven.plugin.plexus.executor.IntegratedPluginExecutor</implementation>
</component>
-
- <!-- Wagon -->
-
<component>
<role>org.apache.maven.wagon.managers.WagonManager</role>
<implementation>org.apache.maven.wagon.managers.DefaultWagonManager</implementation>
@@ -138,6 +61,5 @@
</requirement>
</requirements>
</component>
-
</components>
</configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
