You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2006/11/26 23:55:24 UTC
svn commit: r479442 - in /maven/components/branches/maven.new: ./
maven-cli/src/assemble/ maven-core/src/main/java/org/apache/maven/plugin/
Author: jvanzyl
Date: Sun Nov 26 14:55:24 2006
New Revision: 479442
URL: http://svn.apache.org/viewvc?view=rev&rev=479442
Log:
o updating to use the use goods in plexus
Modified:
maven/components/branches/maven.new/build.xml
maven/components/branches/maven.new/maven-cli/src/assemble/bin.xml
maven/components/branches/maven.new/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/branches/maven.new/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java
maven/components/branches/maven.new/pom.xml
Modified: maven/components/branches/maven.new/build.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven.new/build.xml?view=diff&rev=479442&r1=479441&r2=479442
==============================================================================
--- maven/components/branches/maven.new/build.xml (original)
+++ maven/components/branches/maven.new/build.xml Sun Nov 26 14:55:24 2006
@@ -96,8 +96,8 @@
</macrodef>
<pull orgpath="commons-cli/commons-cli" version="1.0" name="commons-cli"/>
<pull orgpath="org/codehaus/plexus/plexus-utils" version="1.1" name="plexus-utils"/>
- <pull orgpath="org/codehaus/plexus/plexus-container-default" version="1.0-alpha-11-SNAPSHOT" name="plexus-container-default"/>
- <pull orgpath="org/codehaus/plexus/plexus-component-api" version="1.0-alpha-11-SNAPSHOT" name="plexus-component-api"/>
+ <pull orgpath="org/codehaus/plexus/plexus-container-default" version="1.0-alpha-12-SNAPSHOT" name="plexus-container-default"/>
+ <pull orgpath="org/codehaus/plexus/plexus-component-api" version="1.0-alpha-12-SNAPSHOT" name="plexus-component-api"/>
<pull orgpath="org/codehaus/plexus/plexus-classworlds" version="1.2-alpha-4-SNAPSHOT" name="plexus-classworlds"/>
<pull orgpath="org/codehaus/plexus/plexus-interactivity-api" version="1.0-alpha-4" name="plexus-interactivity-api"/>
<pull orgpath="org/codehaus/plexus/plexus-archiver" version="1.0-alpha-8-SNAPSHOT" name="plexus-archiver" repository="codehaus"/>
@@ -122,8 +122,8 @@
<path id="pre.classpath">
<pathelement location="${maven.repo.local}/commons-cli/commons-cli/1.0/commons-cli-1.0.jar"/>
<pathelement location="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar"/>
- <pathelement location="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-11-SNAPSHOT/plexus-container-default-1.0-alpha-11-SNAPSHOT.jar"/>
- <pathelement location="${maven.repo.local}/org/codehaus/plexus/plexus-component-api/1.0-alpha-11-SNAPSHOT/plexus-component-api-1.0-alpha-11-SNAPSHOT.jar"/>
+ <pathelement location="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-12-SNAPSHOT/plexus-container-default-1.0-alpha-12-SNAPSHOT.jar"/>
+ <pathelement location="${maven.repo.local}/org/codehaus/plexus/plexus-component-api/1.0-alpha-12-SNAPSHOT/plexus-component-api-1.0-alpha-12-SNAPSHOT.jar"/>
<pathelement location="${maven.repo.local}/org/codehaus/plexus/plexus-classworlds/1.2-alpha-4-SNAPSHOT/plexus-classworlds-1.2-alpha-4-SNAPSHOT.jar"/>
<pathelement location="${maven.repo.local}/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar"/>
<pathelement location="${maven.repo.local}/org/apache/maven/wagon/wagon-file/1.0-alpha-7/wagon-file-1.0-alpha-7.jar"/>
Modified: maven/components/branches/maven.new/maven-cli/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven.new/maven-cli/src/assemble/bin.xml?view=diff&rev=479442&r1=479441&r2=479442
==============================================================================
--- maven/components/branches/maven.new/maven-cli/src/assemble/bin.xml (original)
+++ maven/components/branches/maven.new/maven-cli/src/assemble/bin.xml Sun Nov 26 14:55:24 2006
@@ -37,7 +37,6 @@
<outputDirectory>conf</outputDirectory>
</fileSet>
<fileSet>
- <!-- TODO: use expressions instead: ${project.build.directory}, ${project.build.finalName}, or have a <build /> tag to include the built artifact -->
<directory>target</directory>
<outputDirectory>lib</outputDirectory>
<includes>
Modified: maven/components/branches/maven.new/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven.new/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?view=diff&rev=479442&r1=479441&r2=479442
==============================================================================
--- maven/components/branches/maven.new/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original)
+++ maven/components/branches/maven.new/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Sun Nov 26 14:55:24 2006
@@ -74,6 +74,7 @@
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
+import org.codehaus.plexus.classworlds.realm.ClassRealm;
import java.io.File;
import java.net.URL;
@@ -282,13 +283,12 @@
ArtifactRepository localRepository )
throws PluginManagerException, InvalidPluginException
{
- PlexusContainer child;
+ ClassRealm componentRealm;
+
try
{
- child = container.createChildContainer( plugin.getKey(),
- Collections.singletonList( pluginArtifact.getFile() ),
- Collections.EMPTY_MAP,
- Collections.singletonList( pluginCollector ) );
+ componentRealm = container.createComponentRealm( plugin.getKey(),
+ Collections.singletonList( pluginArtifact.getFile() ) );
}
catch ( PlexusContainerException e )
{
@@ -298,20 +298,21 @@
// this plugin's descriptor should have been discovered in the child creation, so we should be able to
// circle around and set the artifacts and class realm
- PluginDescriptor addedPlugin = pluginCollector.getPluginDescriptor( plugin );
+ PluginDescriptor pluginDescriptor = pluginCollector.getPluginDescriptor( plugin );
- if ( addedPlugin == null )
+ if ( pluginDescriptor == null )
{
throw new IllegalStateException(
"The PluginDescriptor for the plugin " + plugin.getKey() + " was not found" );
}
- addedPlugin.setClassRealm( child.getContainerRealm() );
+ //pluginDescriptor.setClassRealm( child.getContainerRealm() );
+ pluginDescriptor.setClassRealm( componentRealm );
// we're only setting the plugin's artifact itself as the artifact list, to allow it to be retrieved
// later when the plugin is first invoked. Retrieving this artifact will in turn allow us to
// transitively resolve its dependencies, and add them to the plugin container...
- addedPlugin.setArtifacts( Collections.singletonList( pluginArtifact ) );
+ pluginDescriptor.setArtifacts( Collections.singletonList( pluginArtifact ) );
try
{
@@ -328,10 +329,7 @@
Set artifacts = MavenMetadataSource.createArtifacts( artifactFactory, projectPlugin.getDependencies(), null,
null, project );
-// Set artifacts =
-// MavenMetadataSource.createArtifacts( artifactFactory, plugin.getDependencies(), null, null, project );
-
- addedPlugin.setIntroducedDependencyArtifacts( artifacts );
+ pluginDescriptor.setIntroducedDependencyArtifacts( artifacts );
}
catch ( InvalidDependencyVersionException e )
{
@@ -394,13 +392,21 @@
Mojo plugin;
PluginDescriptor pluginDescriptor = mojoDescriptor.getPluginDescriptor();
+
String goalId = mojoDescriptor.getGoal();
+
String groupId = pluginDescriptor.getGroupId();
+
String artifactId = pluginDescriptor.getArtifactId();
+
String executionId = mojoExecution.getExecutionId();
+
Xpp3Dom dom = project.getGoalConfiguration( groupId, artifactId, executionId, goalId );
+
Xpp3Dom reportDom = project.getReportConfiguration( groupId, artifactId, executionId );
+
dom = Xpp3Dom.mergeXpp3Dom( dom, reportDom );
+
if ( mojoExecution.getConfiguration() != null )
{
dom = Xpp3Dom.mergeXpp3Dom( dom, mojoExecution.getConfiguration() );
@@ -410,6 +416,7 @@
// Event monitoring.
String event = MavenEvents.MOJO_EXECUTION;
+
EventDispatcher dispatcher = session.getEventDispatcher();
String goalExecId = goalName;
@@ -448,6 +455,7 @@
Thread.currentThread().setContextClassLoader( oldClassLoader );
+ /*
try
{
PlexusContainer pluginContainer = getPluginContainer( mojoDescriptor.getPluginDescriptor() );
@@ -461,6 +469,7 @@
getLogger().error( "Error releasing plugin - ignoring.", e );
}
}
+ */
}
}
@@ -512,6 +521,9 @@
private PlexusContainer getPluginContainer( PluginDescriptor pluginDescriptor )
throws PluginManagerException
{
+ return container;
+
+ /*
String pluginKey = pluginDescriptor.getPluginLookupKey();
PlexusContainer pluginContainer = container.getChildContainer( pluginKey );
@@ -522,6 +534,7 @@
}
return pluginContainer;
+ */
}
private Mojo getConfiguredMojo( MavenSession session,
Modified: maven/components/branches/maven.new/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven.new/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java?view=diff&rev=479442&r1=479441&r2=479442
==============================================================================
--- maven/components/branches/maven.new/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java (original)
+++ maven/components/branches/maven.new/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java Sun Nov 26 14:55:24 2006
@@ -50,7 +50,9 @@
if ( componentSetDescriptor instanceof PluginDescriptor )
{
PluginDescriptor pluginDescriptor = (PluginDescriptor) componentSetDescriptor;
-
+
+ System.out.println( "pluginDescriptor = " + pluginDescriptor );
+
// TODO: see comment in getPluginDescriptor
String key = Plugin.constructKey( pluginDescriptor.getGroupId(), pluginDescriptor.getArtifactId() );
Modified: maven/components/branches/maven.new/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven.new/pom.xml?view=diff&rev=479442&r1=479441&r2=479442
==============================================================================
--- maven/components/branches/maven.new/pom.xml (original)
+++ maven/components/branches/maven.new/pom.xml Sun Nov 26 14:55:24 2006
@@ -158,12 +158,17 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-11-SNAPSHOT</version>
+ <version>1.0-alpha-12-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-api</artifactId>
+ <version>1.0-alpha-12-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-classworlds</artifactId>
- <version>1.2-alpha-4-SNAPSHOT</version>
+ <version>1.2-alpha-4</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>