You are viewing a plain text version of this content. The canonical link for it is here.
Posted to m2-dev@maven.apache.org by jv...@apache.org on 2004/07/03 04:34:43 UTC
cvs commit: maven-components/maven-core/src/main/resources/META-INF/plexus plexus.xml
jvanzyl 2004/07/02 19:34:43
Modified: maven-core/src/main/java/org/apache/maven DefaultMaven.java
Maven.java MavenCli.java
maven-core/src/main/resources/META-INF/plexus plexus.xml
Log:
o updating for some changes that i made in plexus to allow for client code
to add jar repositories on the fly and trigger the discovery of components
in the jar repository. in our case we have a repository of maven plugins
that we want push into the view of plexus and then trigger the discovery
of the plugins.
Revision Changes Path
1.2 +12 -5 maven-components/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Index: DefaultMaven.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/DefaultMaven.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultMaven.java 3 Jul 2004 01:39:45 -0000 1.1
+++ DefaultMaven.java 3 Jul 2004 02:34:43 -0000 1.2
@@ -337,11 +337,6 @@
public String getMavenHome()
{
- if ( mavenHome == null )
- {
- mavenHome = System.getProperty( MavenConstants.MAVEN_HOME );
- }
-
return mavenHome;
}
@@ -387,5 +382,17 @@
{
return secs + " seconds";
}
+ }
+
+ // ----------------------------------------------------------------------
+ //
+ // ----------------------------------------------------------------------
+
+ public void booty()
+ throws Exception
+ {
+ container.addJarRepository( new File( mavenHome, "plugins" ) );
+
+ container.discoverComponents();
}
}
1.9 +8 -1 maven-components/maven-core/src/main/java/org/apache/maven/Maven.java
Index: Maven.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/Maven.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Maven.java 3 Jul 2004 01:39:45 -0000 1.8
+++ Maven.java 3 Jul 2004 02:34:43 -0000 1.9
@@ -89,6 +89,13 @@
// Maven project handling
// ----------------------------------------------------------------------
- public MavenProject getProject( File project )
+ MavenProject getProject( File project )
throws ProjectBuildingException;
+
+ // ----------------------------------------------------------------------
+ //
+ // ----------------------------------------------------------------------
+
+ void booty()
+ throws Exception;
}
1.9 +9 -3 maven-components/maven-core/src/main/java/org/apache/maven/MavenCli.java
Index: MavenCli.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/MavenCli.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MavenCli.java 3 Jul 2004 01:39:45 -0000 1.8
+++ MavenCli.java 3 Jul 2004 02:34:43 -0000 1.9
@@ -52,15 +52,21 @@
initializeSystemProperties( commandLine );
- Embedder embedder = new Embedder();
+ //---
- embedder.addContextValue( "maven.home", findMavenHome() );
+ Embedder embedder = new Embedder();
embedder.start( classWorld );
Maven maven = (Maven) embedder.lookup( Maven.ROLE );
+ maven.setMavenHome( findMavenHome() );
+
maven.setLocalRepository( findLocalRepository() );
+
+ maven.booty();
+
+ //---
File projectFile;
1.3 +0 -3 maven-components/maven-core/src/main/resources/META-INF/plexus/plexus.xml
Index: plexus.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/resources/META-INF/plexus/plexus.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plexus.xml 2 Jul 2004 02:23:30 -0000 1.2
+++ plexus.xml 3 Jul 2004 02:34:43 -0000 1.3
@@ -9,9 +9,6 @@
<component-discoverer implementation="org.apache.maven.plugin.MavenPluginDiscoverer"/>
</component-discoverers>
</component-discoverer-manager>
- <resources>
- <jar-repository>${maven.home}/plugins</jar-repository>
- </resources>
<components>
<component>
<role>org.apache.maven.plugin.PluginManager</role>