Author: jvanzyl
Date: Sat Nov 25 14:22:23 2006
New Revision: 479214
URL: http://svn.apache.org/viewvc?view=rev&rev=479214
Log:
o applying yet another patch by andy, still lining up plexus/classworlds
Modified:
maven/components/branches/maven.new/maven-core/pom.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/test/java/org/apache/maven/MavenTestUtils.java
maven/components/branches/maven.new/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
maven/components/branches/maven.new/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
maven/components/branches/maven.new/pom.xml
Modified: maven/components/branches/maven.new/maven-core/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven.new/maven-core/pom.xml?view=diff&rev=479214&r1=479213&r2=479214
==============================================================================
--- maven/components/branches/maven.new/maven-core/pom.xml (original)
+++ maven/components/branches/maven.new/maven-core/pom.xml Sat Nov 25 14:22:23
2006
@@ -178,6 +178,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-classworlds</artifactId>
+ <version>1.2-alpha-4-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
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=479214&r1=479213&r2=479214
==============================================================================
---
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
Sat Nov 25 14:22:23 2006
@@ -411,9 +411,7 @@
try
{
- // TODO - WE NEED TO TIDY THIS CLASSLOADER STUFF - NASTY CASTING
- Thread.currentThread().setContextClassLoader( (ClassLoader)
-
mojoDescriptor.getPluginDescriptor().getClassRealm().getStrategy() );
+ Thread.currentThread().setContextClassLoader(
mojoDescriptor.getPluginDescriptor().getClassRealm() );
plugin.execute();
Modified:
maven/components/branches/maven.new/maven-core/src/test/java/org/apache/maven/MavenTestUtils.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven.new/maven-core/src/test/java/org/apache/maven/MavenTestUtils.java?view=diff&rev=479214&r1=479213&r2=479214
==============================================================================
---
maven/components/branches/maven.new/maven-core/src/test/java/org/apache/maven/MavenTestUtils.java
(original)
+++
maven/components/branches/maven.new/maven-core/src/test/java/org/apache/maven/MavenTestUtils.java
Sat Nov 25 14:22:23 2006
@@ -16,8 +16,8 @@
* limitations under the License.
*/
-import org.codehaus.classworlds.realm.ClassRealm;
-import org.codehaus.classworlds.ClassWorld;
+import org.codehaus.plexus.classworlds.realm.ClassRealm;
+import org.codehaus.plexus.classworlds.ClassWorld;
import org.codehaus.plexus.DefaultPlexusContainer;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.PlexusContainerException;
Modified:
maven/components/branches/maven.new/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven.new/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?view=diff&rev=479214&r1=479213&r2=479214
==============================================================================
---
maven/components/branches/maven.new/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
(original)
+++
maven/components/branches/maven.new/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
Sat Nov 25 14:22:23 2006
@@ -48,8 +48,8 @@
import org.apache.maven.settings.Server;
import org.apache.maven.settings.Settings;
import org.apache.maven.wagon.events.TransferListener;
-import org.codehaus.classworlds.ClassWorld;
-import org.codehaus.classworlds.realm.DuplicateRealmException;
+import org.codehaus.plexus.classworlds.ClassWorld;
+import org.codehaus.plexus.classworlds.realm.DuplicateRealmException;
import org.codehaus.plexus.PlexusContainerException;
import org.codehaus.plexus.component.repository.ComponentDescriptor;
import
org.codehaus.plexus.component.repository.exception.ComponentLifecycleException;
Modified:
maven/components/branches/maven.new/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven.new/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java?view=diff&rev=479214&r1=479213&r2=479214
==============================================================================
---
maven/components/branches/maven.new/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
(original)
+++
maven/components/branches/maven.new/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
Sat Nov 25 14:22:23 2006
@@ -21,7 +21,7 @@
import org.apache.maven.plugin.lifecycle.Lifecycle;
import org.apache.maven.plugin.lifecycle.LifecycleConfiguration;
import org.apache.maven.plugin.lifecycle.io.xpp3.LifecycleMappingsXpp3Reader;
-import org.codehaus.classworlds.realm.ClassRealm;
+import org.codehaus.plexus.classworlds.realm.ClassRealm;
import org.codehaus.plexus.component.repository.ComponentSetDescriptor;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
Modified: maven/components/branches/maven.new/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven.new/pom.xml?view=diff&rev=479214&r1=479213&r2=479214
==============================================================================
--- maven/components/branches/maven.new/pom.xml (original)
+++ maven/components/branches/maven.new/pom.xml Sat Nov 25 14:22:23 2006
@@ -27,7 +27,7 @@
</parent>
<artifactId>maven</artifactId>
<packaging>pom</packaging>
- <name>Apache Maven</name>
+ <name>Maven</name>
<version>2.1-SNAPSHOT</version>
<description>Maven is a project development management and comprehension
tool. Based on the concept of a project object model: builds, dependency
management, documentation creation, site publication, and distribution
publication are all controlled from the declarative file. Maven can be extended
by plugins to utilise a number of other development tools for reporting or the
build process.</description>
<url>http://maven.apache.org/</url>
@@ -155,11 +155,6 @@
</dependencies>
<dependencyManagement>
<dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-classworlds</artifactId>
- <version>1.2-alpha-4-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
