Author: jvanzyl
Date: Tue Oct 4 06:15:58 2005
New Revision: 293598
URL: http://svn.apache.org/viewcvs?rev=293598&view=rev
Log:
o protecting against null properties in the PPEE
o fixing some composition declarations in embedder component descriptor
o adding notes on classloader mechanism
Added:
maven/components/trunk/maven-site/src/site/apt/guides/getting-started/classloaders.txt
(with props)
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
maven/components/trunk/maven-embedder/pom.xml
maven/components/trunk/maven-embedder/src/main/resources/META-INF/plexus/components.xml
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java?rev=293598&r1=293597&r2=293598&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
Tue Oct 4 06:15:58 2005
@@ -278,7 +278,7 @@
value = project.getProperties().getProperty( expression );
}
- if ( value == null )
+ if ( value == null && properties != null )
{
// We will attempt to get nab a system property as a way to
specify a
// parameter to a plugins. My particular case here is allowing
the surefire
Modified: maven/components/trunk/maven-embedder/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-embedder/pom.xml?rev=293598&r1=293597&r2=293598&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/pom.xml (original)
+++ maven/components/trunk/maven-embedder/pom.xml Tue Oct 4 06:15:58 2005
@@ -13,7 +13,7 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>RELEASE</version>
+ <version>2.0-beta-1</version>
<configuration>
<descriptor>src/main/assembly/dep.xml</descriptor>
</configuration>
@@ -22,6 +22,11 @@
</build>
<dependencies>
<dependency>
+ <groupId>plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.0.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</dependency>
@@ -97,10 +102,6 @@
<artifactId>maven-core</artifactId>
<version>2.0-beta-3-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </dependency>
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-input-handler</artifactId>
Modified:
maven/components/trunk/maven-embedder/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-embedder/src/main/resources/META-INF/plexus/components.xml?rev=293598&r1=293597&r2=293598&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/components/trunk/maven-embedder/src/main/resources/META-INF/plexus/components.xml
Tue Oct 4 06:15:58 2005
@@ -627,9 +627,11 @@
<requirement>
<role>org.apache.maven.extension.ExtensionManager</role>
</requirement>
+ <!--
<requirement>
<role>org.apache.maven.project.injection.ModelDefaultsInjector</role>
</requirement>
+ -->
<requirement>
<role>org.apache.maven.artifact.handler.manager.ArtifactHandlerManager</role>
</requirement>
Modified:
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java?rev=293598&r1=293597&r2=293598&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
(original)
+++
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
Tue Oct 4 06:15:58 2005
@@ -70,7 +70,7 @@
File pomFile = new File( targetDirectory, "pom.xml" );
- MavenProject pom = maven.readProjectWithDependencies( pomFile );
+ MavenProject pom = maven.readProjectWithDependencies( pomFile );
EventMonitor eventMonitor = new DefaultEventMonitor( new
PlexusLoggerAdapter( new MavenEmbedderConsoleLogger() ) );
@@ -78,7 +78,7 @@
Collections.singletonList( "package" ),
eventMonitor,
new ConsoleDownloadMonitor(),
- null,
+ new Properties(),
targetDirectory );
File jar = new File( targetDirectory,
"target/embedder-test-project-1.0-SNAPSHOT.jar" );
Added:
maven/components/trunk/maven-site/src/site/apt/guides/getting-started/classloaders.txt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/guides/getting-started/classloaders.txt?rev=293598&view=auto
==============================================================================
---
maven/components/trunk/maven-site/src/site/apt/guides/getting-started/classloaders.txt
(added)
+++
maven/components/trunk/maven-site/src/site/apt/guides/getting-started/classloaders.txt
Tue Oct 4 06:15:58 2005
@@ -0,0 +1,24 @@
+To add a bit of detail for a volunteer to submit as documentation... :)
+
+m2/core/boot is what is in the java classpath (ie, just classworlds,
+which constructs classloaders for the rest of the system)
+
+the top level classloader contains plexus container and plexus utils
+(see m2/core), and also has access to classworlds
+
+the next classloader has the libraries in m2/lib (a bug in beta 1
+incorporated commons-logging and -lang, sorry about that!) In general
+these are just maven libraries. We hope to further separate these in
+future to just be maven apis.
+
+after that, each plugin has its own classloader, including its
+dependencies, itself, and the libraries above. It *does not* contain
+the project dependencies like in m1, but instead has access to a list
+of JAR files in case they are needed.
+
+In addition, a project can list "extensions". These are loaded into
+the same place as m2/lib and so available to the maven core and all
+plugins for the currnet project and subsequent projects (in future, we
+plan to remove it from subsequent projects).
+
+- Brett
Propchange:
maven/components/trunk/maven-site/src/site/apt/guides/getting-started/classloaders.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/trunk/maven-site/src/site/apt/guides/getting-started/classloaders.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
