maven-m2-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject cvs commit: maven-components/maven-core/src/site/apt faq.apt
Date Sat, 23 Oct 2004 13:37:18 GMT
jvanzyl     2004/10/23 06:37:18

  Modified:    maven-core/src/bin classworlds.conf m2 m2.bat
               maven-core/src/main/java/org/apache/maven/plugin
                        DefaultPluginManager.java
               maven-core/src/main/resources/META-INF/plexus plexus.xml
  Added:       maven-core/src/main/java/org/apache/maven
                        MavenExceptionHandler.java
               maven-core/src/site/apt faq.apt
  Log:
  o update the scripts for maven for the change in the location of classworlds,
    which reflects the location that the plexus runtime builder places
    classworlds
  
  o change the internal configuration to match some of the changes made to
    plexus to account for elimination of xstream as a dependency. We're not
    all the way there because xstream is still required in the plugin tools.
  
  o a little exception handler stub which I'm going to use to clean up the
    huge stack traces that comes out. Going to map specific exceptions to
    specific errors messages and to specific entries in a FAQ to help users
    learn about commons errors.
  
  Revision  Changes    Path
  1.12      +1 -3      maven-components/maven-core/src/bin/classworlds.conf
  
  Index: classworlds.conf
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/bin/classworlds.conf,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- classworlds.conf	18 Sep 2004 06:08:18 -0000	1.11
  +++ classworlds.conf	23 Oct 2004 13:37:18 -0000	1.12
  @@ -3,9 +3,7 @@
   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
  
  
  
  1.4       +1 -2      maven-components/maven-core/src/bin/m2
  
  Index: m2
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/bin/m2,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- m2	21 Sep 2004 00:45:35 -0000	1.3
  +++ m2	23 Oct 2004 13:37:18 -0000	1.4
  @@ -66,8 +66,7 @@
   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
  
  
  
  1.4       +1 -1      maven-components/maven-core/src/bin/m2.bat
  
  Index: m2.bat
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/bin/m2.bat,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- m2.bat	24 Sep 2004 14:48:18 -0000	1.3
  +++ m2.bat	23 Oct 2004 13:37:18 -0000	1.4
  @@ -121,7 +121,7 @@
   :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"
   
  
  
  
  1.1                  maven-components/maven-core/src/main/java/org/apache/maven/MavenExceptionHandler.java
  
  Index: MavenExceptionHandler.java
  ===================================================================
  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 <a href="mailto:jason@maven.org">Jason van Zyl</a>
   * @version $Id: MavenExceptionHandler.java,v 1.1 2004/10/23 13:37:18 jvanzyl Exp $
   */
  public class MavenExceptionHandler
  {
  }
  
  
  
  1.13      +12 -4     maven-components/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
  
  Index: DefaultPluginManager.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- DefaultPluginManager.java	6 Oct 2004 14:30:35 -0000	1.12
  +++ DefaultPluginManager.java	23 Oct 2004 13:37:18 -0000	1.13
  @@ -24,6 +24,7 @@
   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 @@
   
       protected ArtifactHandlerManager artifactHandlerManager;
   
  -    protected ArtifactEnabledContainer container;
  +    protected PlexusContainer container;
   
       protected PluginDescriptorBuilder pluginDescriptorBuilder;
   
  @@ -201,9 +202,16 @@
       {
           artifactResolver = (ArtifactResolver) container.lookup( ArtifactResolver.ROLE );
   
  -        MavenMetadataSource sr = new MavenMetadataSource( remotePluginRepositories, localRepository,
artifactResolver );
  -
  -        container.addComponent( pluginArtifact, artifactResolver, remotePluginRepositories,
localRepository, sr, artifactFilter );
  +        MavenMetadataSource metadataSource = new MavenMetadataSource( remotePluginRepositories,

  +                                                                      localRepository,
  +                                                                      artifactResolver
);
  +
  +        ( (ArtifactEnabledContainer) container ).addComponent( pluginArtifact,
  +                                                               artifactResolver,
  +                                                               remotePluginRepositories,
  +                                                               localRepository,
  +                                                               metadataSource,
  +                                                               artifactFilter );
       }
   
       public void contextualize( Context context )
  
  
  
  1.2       +1 -1      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- plexus.xml	9 Aug 2004 19:02:37 -0000	1.1
  +++ plexus.xml	23 Oct 2004 13:37:18 -0000	1.2
  @@ -1,7 +1,7 @@
   <plexus>
     <component-discoverer-manager implementation="org.codehaus.plexus.component.discovery.DefaultComponentDiscovererManager">
       <listeners>
  -      <listener>
  +      <listener implementation="org.codehaus.plexus.component.discovery.DiscoveryListenerDescriptor">
           <role>org.apache.maven.plugin.PluginManager</role>
         </listener>
       </listeners>
  
  
  
  1.1                  maven-components/maven-core/src/site/apt/faq.apt
  
  Index: faq.apt
  ===================================================================
   -----
   Maven2
   -----
   Jason van Zyl
   -----
  
  Maven2
  
    This is maven2. Dig it.
  
  
  

Mime
View raw message