diff --git a/maven-core/src/bin/classworlds.conf b/maven-core/src/bin/classworlds.conf index 5c5a4eaa0a..48f594b19e 100644 --- a/maven-core/src/bin/classworlds.conf +++ b/maven-core/src/bin/classworlds.conf @@ -3,9 +3,7 @@ main is org.apache.maven.MavenCli from plexus.core.maven set maven.home default ${user.home}/m2 [plexus.core] -load ${maven.home}/core/plexus-0.17-SNAPSHOT.jar -load ${maven.home}/core/xstream-1.0-SNAPSHOT.jar -load ${maven.home}/core/xpp3-1.1.3.3.jar +load ${maven.home}/core/*.jar [plexus.core.maven] load ${maven.home}/lib/*.jar diff --git a/maven-core/src/bin/m2 b/maven-core/src/bin/m2 index 75947eec74..0a6dfd8e60 100755 --- a/maven-core/src/bin/m2 +++ b/maven-core/src/bin/m2 @@ -66,8 +66,7 @@ if [ -z "$M2_HOME" ]; then fi CLASSWORLDS_CONF="${M2_HOME}/bin/classworlds.conf" -CP=${M2_HOME}/core/classworlds-${CLASSWORLDS_VERSION}.jar -#CP=${M2_HOME}/lib/classworlds-${CLASSWORLDS_VERSION}.jar +CP=${M2_HOME}/core/boot/classworlds-${CLASSWORLDS_VERSION}.jar # For Cygwin, switch paths to Windows format before running java if $cygwin; then diff --git a/maven-core/src/bin/m2.bat b/maven-core/src/bin/m2.bat index 628ce34012..29211fb9d2 100644 --- a/maven-core/src/bin/m2.bat +++ b/maven-core/src/bin/m2.bat @@ -121,7 +121,7 @@ goto Win9xApp :endInit if "%MAVEN_OPTS%"=="" SET MAVEN_OPTS="-Xmx256m" SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" -SET MAVEN_CLASSPATH="%M2_HOME%\core\classworlds-%CLASSWORLDS_VERSION%.jar" +SET MAVEN_CLASSPATH="%M2_HOME%\core\boot\classworlds-%CLASSWORLDS_VERSION%.jar" SET MAVEN_MAIN_CLASS=org.codehaus.classworlds.Launcher SET CLASSWORLDS_CONF="%M2_HOME%\bin\classworlds.conf" diff --git a/maven-core/src/main/java/org/apache/maven/MavenExceptionHandler.java b/maven-core/src/main/java/org/apache/maven/MavenExceptionHandler.java new file mode 100644 index 0000000000..2941165579 --- /dev/null +++ b/maven-core/src/main/java/org/apache/maven/MavenExceptionHandler.java @@ -0,0 +1,35 @@ +package org.apache.maven; + +/* + * Copyright 2001-2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * This will be the place where we track anything that can possibly go wrong with a + * Maven build and try to provide as much help to the user as possible when + * something does go wrong. This will force us to get specific with exception + * handling because we should be able to point a user to a spot in the documentation + * which explains why a particular exception happened. + * + * o poorly formed XML POMs (make an error handler for xpp3) + * o missing artifacts + * o non existent goals + * + * @author Jason van Zyl + * @version $Id$ + */ +public class MavenExceptionHandler +{ +} diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java index 075fe8aedd..65e8d5625a 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java @@ -24,6 +24,7 @@ import org.apache.maven.plugin.descriptor.PluginDescriptor; import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder; import org.codehaus.plexus.ArtifactEnabledContainer; import org.codehaus.plexus.PlexusConstants; +import org.codehaus.plexus.PlexusContainer; import org.codehaus.plexus.component.discovery.ComponentDiscoveryEvent; import org.codehaus.plexus.component.discovery.ComponentDiscoveryListener; import org.codehaus.plexus.component.repository.ComponentSetDescriptor; @@ -55,7 +56,7 @@ public class DefaultPluginManager protected ArtifactHandlerManager artifactHandlerManager; - protected ArtifactEnabledContainer container; + protected PlexusContainer container; protected PluginDescriptorBuilder pluginDescriptorBuilder; @@ -201,9 +202,16 @@ public class DefaultPluginManager { artifactResolver = (ArtifactResolver) container.lookup( ArtifactResolver.ROLE ); - MavenMetadataSource sr = new MavenMetadataSource( remotePluginRepositories, localRepository, artifactResolver ); + MavenMetadataSource metadataSource = new MavenMetadataSource( remotePluginRepositories, + localRepository, + artifactResolver ); - container.addComponent( pluginArtifact, artifactResolver, remotePluginRepositories, localRepository, sr, artifactFilter ); + ( (ArtifactEnabledContainer) container ).addComponent( pluginArtifact, + artifactResolver, + remotePluginRepositories, + localRepository, + metadataSource, + artifactFilter ); } public void contextualize( Context context ) diff --git a/maven-core/src/main/resources/META-INF/plexus/plexus.xml b/maven-core/src/main/resources/META-INF/plexus/plexus.xml index 35f074a2c6..93d9377748 100644 --- a/maven-core/src/main/resources/META-INF/plexus/plexus.xml +++ b/maven-core/src/main/resources/META-INF/plexus/plexus.xml @@ -1,7 +1,7 @@ - + org.apache.maven.plugin.PluginManager diff --git a/maven-core/src/site/apt/faq.apt b/maven-core/src/site/apt/faq.apt new file mode 100644 index 0000000000..e411db68b8 --- /dev/null +++ b/maven-core/src/site/apt/faq.apt @@ -0,0 +1,9 @@ + ----- + Maven2 + ----- + Jason van Zyl + ----- + +Maven2 + + This is maven2. Dig it.