jvanzyl 2004/12/04 20:16:07
Modified: maven-core/src/bin m2
maven-core/src/main/java/org/apache/maven/artifact/factory
ArtifactFactory.java DefaultArtifactFactory.java
maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase
DependencyDownloadPhase.java
DependencyResolutionPhase.java
GoalAttainmentPhase.java GoalMappingPhase.java
GoalResolutionPhase.java PluginResolutionPhase.java
maven-core/src/main/java/org/apache/maven/lifecycle/goal
AbstractMavenGoalPhase.java
DefaultMavenGoalPhaseManager.java
GoalExecutionException.java
GoalNotFoundException.java
MavenGoalExecutionContext.java MavenGoalPhase.java
MavenGoalPhaseManager.java
maven-core/src/main/java/org/apache/maven/lifecycle/session/phase
GoalExecutionPhase.java
maven-core/src/main/java/org/apache/maven/lifecycle/session
AbstractMavenSessionPhase.java
DefaultMavenSessionPhaseManager.java
MavenSession.java MavenSessionPhase.java
MavenSessionPhaseManager.java
maven-core/src/main/java/org/apache/maven/plugin
DefaultPluginManager.java MavenMojoDescriptor.java
MavenPluginDependency.java
MavenPluginDescriptor.java
MavenPluginDiscoverer.java
OgnlProjectValueExtractor.java
PluginConfigurationException.java
PluginManager.java
maven-core/src/main/java/org/apache/maven/project/inheritance
DefaultModelInheritanceAssembler.java
ModelInheritanceAssembler.java
maven-core/src/main/java/org/apache/maven/project/path
DefaultPathTranslator.java PathTranslator.java
maven-core/src/main/java/org/apache/maven/project/validation
DefaultModelValidator.java
ModelValidationResult.java ModelValidator.java
maven-core/src/main/java/org/apache/maven/project
MavenProject.java MavenProjectBuilder.java
MavenProjectBuildingResult.java
ProjectBuildingException.java
maven-core/src/main/java/org/apache/maven/repository
RepositoryUtils.java
maven-core/src/main/java/org/apache/maven/util
AbstractGoalVisitor.java GoalVisitor.java
GoalWalker.java GraphTraversalException.java
maven-core/src/main/java/org/apache/maven DefaultMaven.java
ExecutionResponse.java Maven.java
maven-core/src/main/resources/META-INF/plexus components.xml
plexus.xml
maven-core/src/main/resources/org/apache/maven/messages
messages_el.properties messages_en.properties
messages_es.properties messages_fr.properties
messages_nl.properties messages_no.properties
messages_pl.properties messages_zh_CN.properties
maven-core/src/main/resources/org/apache/maven/project
pom-4.0.0.xml
maven-core/src/site/apt configuration-management.apt faq.apt
goal-resolution.apt index.apt inheritance.apt
install.apt lifecycle.apt mojos.apt
plugin-descriptors.apt
plugin-execution-isolation.apt plugins.apt
repository-upload.apt
maven-core/src/site site.xml
maven-core/src/test/java/org/apache/maven/lifecycle/goal/phase
GoalAssemblySubProcessTest.java
maven-core/src/test/java/org/apache/maven/lifecycle
MavenLifecycleManagerTest.java
maven-core/src/test/java/org/apache/maven/plugin
AbstractTestPlugin.java
GoalDecorationAndResolutionTestPlugin.java
IntegratedPlugin.java
OgnlProjectValueExtractorTest.java PluginTest.java
maven-core/src/test/java/org/apache/maven/project/canonical
CanonicalProjectBuilderTest.java
maven-core/src/test/java/org/apache/maven/project/helpers
ProjectTestHelper.java
maven-core/src/test/java/org/apache/maven/project/inheritance/t00
ProjectInheritanceTest.java
maven-core/src/test/java/org/apache/maven/project/inheritance/t01
ProjectInheritanceTest.java
maven-core/src/test/java/org/apache/maven/project/inheritance
DefaultModelInheritanceAssemblerTest.java
ProjectInheritanceTestCase.java
maven-core/src/test/java/org/apache/maven/project/validation
DefaultModelValidatorTest.java
maven-core/src/test/java/org/apache/maven/project
AbstractProjectTestCase.java
ProjectBaseDirectoryAlignmentTest.java
maven-core/src/test/java/org/apache/maven MavenTestCase.java
maven-core/src/test/resources/META-INF/maven plugin.xml
maven-core/src/test/resources/inheritance-repo/t00/maven/poms
p0-1.0.pom p1-1.0.pom p2-1.0.pom p3-1.0.pom
p4-1.0.pom
maven-core/src/test/resources/inheritance-repo/t01/maven/poms
p0-1.0.pom p1-1.0.pom p2-1.0.pom p3-1.0.pom
p4-1.0.pom
maven-core/src/test/resources/local-repo/maven-test/jars
maven-test-a-1.0.jar maven-test-b-1.0.jar
maven-test-c-1.0.jar maven-test-d-1.0.jar
maven-core/src/test/resources/local-repo/maven-test/poms
maven-test-a-1.0.pom maven-test-b-1.0.pom
maven-test-c-1.0.pom maven-test-d-1.1.pom
maven-test-d-1.2.pom
maven-core/src/test/resources/local-repo/snapshot-test/jars
maven-snapshot-a-1.0-SNAPSHOT.jar
maven-snapshot-a-1.0-SNAPSHOT.jar.snapshot-version
maven-snapshot-b-1.0-SNAPSHOT.jar
maven-snapshot-b-1.0-SNAPSHOT.jar.snapshot-version
maven-snapshot-e-1.0-SNAPSHOT.jar
maven-snapshot-e-1.0-SNAPSHOT.jar.snapshot-version
maven-core/src/test/resources/local-repo/snapshot-test/poms
maven-test-snapshot-resolving-1.0.pom
maven-core/src/test/resources/org/apache/maven/artifact/manager
DefaultWagonManagerTest.xml
maven-core/src/test/resources/org/apache/maven/plugin
integrated-plugin.xml
maven-core/src/test/resources/projects/base-directory-alignment/subproject
project-which-needs-directory-alignment-child.xml
maven-core/src/test/resources/projects/base-directory-alignment
project-which-needs-directory-alignment-child.xml
project-which-needs-directory-alignment.xml
maven-core/src/test/resources/projects bad-project.xml
build.properties
child-which-inherits-from-super-model.xml
child-with-bogus-parent.xml child.xml
fully-populated-child.xml project.xml
maven-core/src/test/resources/remote-repo-1/maven-test/jars
maven-test-b-1.0.jar maven-test-b-1.0.jar.md5
maven-core/src/test/resources/remote-repo-1/maven-test/poms
maven-test-b-1.0.pom
maven-core/src/test/resources/remote-repo-1/snapshot-test/jars
maven-snapshot-a-1.0-SNAPSHOT.jar
maven-snapshot-a-1.0-SNAPSHOT.jar.snapshot-version
maven-snapshot-b-1.0-SNAPSHOT.jar
maven-snapshot-b-1.0-SNAPSHOT.jar.snapshot-version
maven-snapshot-c-1.0-SNAPSHOT.jar
maven-snapshot-c-1.0-SNAPSHOT.jar.snapshot-version
maven-core/src/test/resources/remote-repo-2/maven-test/jars
maven-test-z-1.0.jar
maven-core/src/test/resources/validation missing-1-pom.xml
missing-artifactId-pom.xml missing-groupId-pom.xml
missing-modelVersion-pom.xml missing-type-pom.xml
missing-version-pom.xml
maven-core/src/test/resources canonical-pom.xml pom.xml
maven-core/src .cvsignore
maven-core .cvsignore LICENSE.txt NOTICE.txt README.txt
checkstyle-license.txt deploy-site plugin-notes.txt
pom.xml
Added: maven-core/src/bin m2.conf
maven-core/src/main/java/org/apache/maven/artifact
JarOverrideRequestTransformation.java
SnapshotRequestTransformation.java
maven-core/src/main/java/org/apache/maven/cli MavenCli.java
MavenConstants.java
maven-core/src/main/java/org/apache/maven/exception
MavenExceptionHandler.java
MavenHomeNotDefinedException.java
maven-core/src/main/java/org/apache/maven/reactor
ReactorException.java
maven-core/src/test/java/org/apache/maven
MavenTestUtils.java
Removed: maven-core/src/bin classworlds.conf
maven-core/src/main/java/org/apache/maven
JarOverrideRequestTransformation.java MavenCli.java
MavenConstants.java MavenExceptionHandler.java
MavenHomeNotDefinedException.java
MavenTestUtils.java ReactorException.java
SnapshotRequestTransformation.java
Log:
o Trying to keep only keep the main entry point into maven as the only classes in the top level package.
Revision Changes Path
1.6 +14 -6 maven-components/maven-core/src/bin/m2
Index: m2
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/bin/m2,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- m2 27 Oct 2004 18:03:44 -0000 1.5
+++ m2 5 Dec 2004 04:16:03 -0000 1.6
@@ -1,7 +1,15 @@
#!/bin/sh
-# Copyright (c) 2001-2002 The Apache Software Foundation. All rights
-# reserved.
+# -----------------------------------------------------------------------------
+# Copyright (c) 2001-2005 The Apache Software Foundation.
+# All rights reserved.
+# -----------------------------------------------------------------------------
+
+#@#
+CLASSWORLDS_JAR=${M2_HOME}/core/boot/classworlds-*.jar
+CLASSWORLDS_CONF=${M2_HOME}/bin/m2.conf
+CLASSWORLDS_LAUNCHER=org.codehaus.classworlds.Launcher
+#@#
if [ -z "$MAVEN_OPTS" ] ; then
MAVEN_OPTS="-Xmx256m"
@@ -73,8 +81,8 @@
$JAVACMD \
$MAVEN_OPTS \
- -classpath ${M2_HOME}/core/boot/classworlds-*.jar \
- "-Dclassworlds.conf=${M2_HOME}/bin/classworlds.conf" \
- "-Dmaven.home=$M2_HOME" \
- org.codehaus.classworlds.Launcher $@
+ -classpath ${CLASSWORLDS_JAR} \
+ "-Dclassworlds.conf=${CLASSWORLDS_CONF}" \
+ "-Dmaven.home=${M2_HOME}" \
+ ${CLASSWORLDS_LAUNCHER} $@
1.1 maven-components/maven-core/src/bin/m2.conf
Index: m2.conf
===================================================================
main is org.apache.maven.cli.MavenCli from plexus.core.maven
set maven.home default ${user.home}/m2
[plexus.core]
load ${maven.home}/core/*.jar
[plexus.core.maven]
load ${maven.home}/lib/*.jar
1.2 +0 -0 maven-components/maven-core/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java
Index: ArtifactFactory.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.4 +0 -0 maven-components/maven-core/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java
Index: DefaultArtifactFactory.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
1.1 maven-components/maven-core/src/main/java/org/apache/maven/artifact/JarOverrideRequestTransformation.java
Index: JarOverrideRequestTransformation.java
===================================================================
package org.apache.maven.artifact;
/*
* 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.
*/
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.request.ArtifactRequestTransformation;
import java.util.Map;
import java.util.Set;
public class JarOverrideRequestTransformation
implements ArtifactRequestTransformation
{
public Artifact transform( Artifact artifact,
ArtifactRepository localRepository,
Set remoteRepositories,
Map parameters )
throws Exception
{
/* TODO: need an override in the POM
MavenProject project = (MavenProject) parameters.get( "project" );
boolean mavenJarOverride = project.getBooleanProperty( "maven.jar.override" );
String mavenJarProperty = project.getProperty( "maven.jar." + project.getArtifactId() );
if ( mavenJarOverride && StringUtils.isNotEmpty( mavenJarProperty ) )
{
Artifact transformedArtifact = new DefaultArtifact( artifact.getGroupId(),
artifact.getArtifactId(),
mavenJarProperty,
artifact.getType() );
return transformedArtifact;
}
*/
return artifact;
}
}
1.1 maven-components/maven-core/src/main/java/org/apache/maven/artifact/SnapshotRequestTransformation.java
Index: SnapshotRequestTransformation.java
===================================================================
package org.apache.maven.artifact;
/*
* 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.
*/
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.request.ArtifactRequestTransformation;
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.codehaus.plexus.util.FileUtils;
import java.io.File;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Map;
import java.util.Set;
import java.util.TimeZone;
/**
* @author <a href="mailto:mmaczka@interia.pl">Michal Maczka</a>
* @version $Id: SnapshotRequestTransformation.java,v 1.1 2004/12/05 04:16:03 jvanzyl Exp $
*/
public class SnapshotRequestTransformation
implements ArtifactRequestTransformation
{
private ArtifactResolver artifactResolver;
public Artifact transform( Artifact artifact,
ArtifactRepository localRepository,
Set repositories,
Map parameters )
throws Exception
{
Date localVersion = getLocalVersion( artifact, localRepository );
Date remoteVersion = getRemoteVersion( artifact, repositories, localRepository );
if ( remoteVersion != null )
{
//if local version is unknown (null) it means that
//we don't have this file locally. so we will be happy
// to have any snapshot.
// we wil download in two cases:
// a) we don't have any snapot in local repo
// b) we have found newer version in remote repository
if ( localVersion == null || localVersion.before( remoteVersion ) )
{
// here we know that we have artifact like foo-1.2-SNAPSHOT.jar
// and the remote timestamp is something like 20010304.121212
// so we might as well fetch foo-1.2-20010304.121212.jar
// but we are just going to fetch foo-1.2-SNAPSHOT.jar.
// We can change the strategy which is used here later on
// @todo we will delete old file first.
//it is not really a right thing to do. Artifact Dowloader should
// fetch to temprary file and replace the old file with the new
// one once download was finished
artifact.getFile().delete();
artifactResolver.resolve( artifact, repositories, localRepository );
File snapshotVersionFile = getSnapshotVersionFile( artifact, localRepository );
String timestamp = getTimestamp( remoteVersion );
// delete old one
if ( snapshotVersionFile.exists() )
{
snapshotVersionFile.delete();
}
FileUtils.fileWrite( snapshotVersionFile.getPath(), timestamp );
}
}
return artifact;
}
private File getSnapshotVersionFile( Artifact artifact, ArtifactRepository localRepository )
{
return null;
//return new File( localRepository.fullArtifactPath( artifact ) );
}
private Date getRemoteVersion( Artifact artifact, Set remoteRepositories, ArtifactRepository localRepository )
throws Exception
{
Date retValue = null;
artifactResolver.resolve( artifact, remoteRepositories, localRepository );
String timestamp = FileUtils.fileRead( artifact.getPath() );
retValue = parseTimestamp( timestamp );
return retValue;
}
private Date getLocalVersion( Artifact artifact, ArtifactRepository localRepository )
{
//assert artifact.exists();
Date retValue = null;
try
{
File file = getSnapshotVersionFile( artifact, localRepository );
if ( file.exists() )
{
String timestamp = FileUtils.fileRead( file );
retValue = parseTimestamp( timestamp );
}
}
catch ( Exception e )
{
// ignore
}
if ( retValue == null )
{
//try "traditional method" used in maven1 for obtaining snapshot version
File file = artifact.getFile();
if ( file.exists() )
{
retValue = new Date( file.lastModified() );
//@todo we should "normalize" the time.
/*TimeZone gmtTimeZone = TimeZone.getTimeZone( "GMT" );
TimeZone userTimeZone = TimeZone.getDefault();
long diff =
*/
}
}
return retValue;
}
private final static String DATE_FORMAT = "yyyyMMdd.HHmmss";
private static SimpleDateFormat getFormatter()
{
SimpleDateFormat formatter = new SimpleDateFormat( DATE_FORMAT );
formatter.setTimeZone( TimeZone.getTimeZone( "GMT" ) );
return formatter;
}
public static String getTimestamp
()
{
Date now = new Date();
SimpleDateFormat formatter = getFormatter();
String retValue = formatter.format( now );
return retValue;
}
public static Date parseTimestamp ( String timestamp )
throws ParseException
{
Date retValue = getFormatter().parse( timestamp );
return retValue;
}
public static String getTimestamp ( Date snapshotVersion )
{
String retValue = getFormatter().format( snapshotVersion );
return retValue;
}
}
1.1 maven-components/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
Index: MavenCli.java
===================================================================
package org.apache.maven.cli;
/*
* 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.
*/
import java.io.File;
import java.util.Iterator;
import java.util.TreeMap;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.PosixParser;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.Maven;
import org.apache.maven.ExecutionResponse;
import org.codehaus.classworlds.ClassWorld;
import org.codehaus.plexus.embed.ArtifactEnabledEmbedder;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id: MavenCli.java,v 1.1 2004/12/05 04:16:03 jvanzyl Exp $
*/
public class MavenCli
{
public static final String POMv3 = "project.xml";
public static final String POMv4 = "pom.xml";
public static int main( String[] args, ClassWorld classWorld )
throws Exception
{
CLIManager cliManager = new CLIManager();
CommandLine commandLine = cliManager.parse( args );
initializeSystemProperties( commandLine );
//---
ArtifactEnabledEmbedder embedder = new ArtifactEnabledEmbedder();
embedder.start( classWorld );
Maven maven = (Maven) embedder.lookup( Maven.ROLE );
maven.setMavenHome( new File( System.getProperty( "maven.home" ) ) );
maven.setMavenHomeLocal( new File( System.getProperty( "maven.home.local", System.getProperty( "user.home" ) + "/.m2" ) ) );
//---
File projectFile;
projectFile = new File( System.getProperty( "user.dir" ), POMv4 );
if ( !projectFile.exists() )
{
projectFile = new File( System.getProperty( "user.dir" ), POMv3 );
if ( !projectFile.exists() )
{
System.err.println( "Could not find either a " + POMv4 + " nor a " + POMv3 + " project descriptor." );
// TODO: Use some constant for this value. Trygve.
return 1;
}
}
// ----------------------------------------------------------------------
// Process particular command line options
// ----------------------------------------------------------------------
if ( commandLine.hasOption( CLIManager.HELP ) )
{
cliManager.displayHelp();
return 0;
}
if ( commandLine.hasOption( CLIManager.VERSION ) )
{
// TODO: create some sane output.
// Take this info from generated piece of meta data which uses
// the POM itself as the source. We don't want to get into the same
// bullshit of manually updating some constant in the source.
// [Brett] My thoughts on this (something I long ago slated for m1), is to store the pom in
// META-INF or something similar for a jar, and then read that back. maven-model being so
// trim makes that more of a reality. The other alternative is simply to store that info in
// the manifest in plain text and read that back.
System.out.println( "Maven version: " );
return 0;
}
if ( commandLine.hasOption( CLIManager.LIST_GOALS ) )
{
Iterator goals = new TreeMap( maven.getMojoDescriptors() ).values().iterator();
System.out.println( "Goals: " );
while ( goals.hasNext() )
{
MojoDescriptor goal = (MojoDescriptor)goals.next();
System.out.println( " " + goal.getId() );
}
return 0;
}
ExecutionResponse response = null;
// ----------------------------------------------------------------------
// Execute the goals
// ----------------------------------------------------------------------
if ( commandLine.hasOption( CLIManager.REACTOR ) )
{
String includes = System.getProperty( "maven.reactor.includes", "**/" + POMv4 );
String excludes = System.getProperty( "maven.reactor.excludes", POMv4 );
String goals = "";
for ( Iterator i = commandLine.getArgList().iterator(); i.hasNext(); )
{
goals += (String) i.next();
if ( i.hasNext() )
{
goals += ",";
}
}
if ( !"".equals( goals ) )
{
response = maven.executeReactor( goals, includes, excludes );
}
}
else
{
response = maven.execute( projectFile, commandLine.getArgList() );
}
// @todo we may wish for more types of error codes - perhaps letting the response define them?
if ( response.isExecutionFailure() )
{
return 1;
}
else
{
return 0;
}
}
// ----------------------------------------------------------------------
// System properties handling
// ----------------------------------------------------------------------
private static void initializeSystemProperties( CommandLine commandLine )
{
// Options that are set on the command line become system properties
// and therefore are set in the session properties. System properties
// are most dominant.
if ( commandLine.hasOption( CLIManager.DEBUG ) )
{
System.setProperty( MavenConstants.DEBUG_ON, "true" );
}
else
{
System.setProperty( MavenConstants.DEBUG_ON, "false" );
}
if ( commandLine.hasOption( CLIManager.SET_SYSTEM_PROPERTY ) )
{
String[] defStrs = commandLine.getOptionValues( CLIManager.SET_SYSTEM_PROPERTY );
for ( int i = 0; i < defStrs.length; ++i )
{
setCliProperty( defStrs[i] );
}
}
}
private static void setCliProperty( String property )
{
String name = null;
String value = null;
int i = property.indexOf( "=" );
if ( i <= 0 )
{
name = property.trim();
value = "true";
}
else
{
name = property.substring( 0, i ).trim();
value = property.substring( i + 1 ).trim();
}
System.setProperty( name, value );
}
// ----------------------------------------------------------------------
// Command line manager
// ----------------------------------------------------------------------
static class CLIManager
{
public static final char NO_BANNER = 'b';
public static final char SET_SYSTEM_PROPERTY = 'D';
public static final char WORK_OFFLINE = 'o';
public static final char REACTOR = 'r';
public static final char DEBUG = 'X';
public static final char HELP = 'h';
public static final char VERSION = 'v';
public static final char LIST_GOALS = 'g';
private Options options = null;
public CLIManager()
{
options = new Options();
options.addOption( OptionBuilder
.withLongOpt( "nobanner" )
.withDescription( "Suppress logo banner" )
.create( NO_BANNER ) );
options.addOption( OptionBuilder
.withLongOpt( "define" )
.hasArg()
.withDescription( "Define a system property" )
.create( SET_SYSTEM_PROPERTY ) );
options.addOption( OptionBuilder
.withLongOpt( "offline" )
.hasArg()
.withDescription( "Work offline" )
.create( WORK_OFFLINE ) );
options.addOption( OptionBuilder
.withLongOpt( "mojoDescriptors" )
.withDescription( "Display available mojoDescriptors" )
.create( LIST_GOALS ) );
options.addOption( OptionBuilder
.withLongOpt( "help" )
.withDescription( "Display help information" )
.create( HELP ) );
options.addOption( OptionBuilder
.withLongOpt( "offline" )
.withDescription( "Build is happening offline" )
.create( WORK_OFFLINE ) );
options.addOption( OptionBuilder
.withLongOpt( "version" )
.withDescription( "Display version information" )
.create( VERSION ) );
options.addOption( OptionBuilder
.withLongOpt( "debug" )
.withDescription( "Produce execution debug output" )
.create( DEBUG ) );
options.addOption( OptionBuilder
.withLongOpt( "reactor" )
.withDescription( "Execute goals for project found in the reactor" )
.create( REACTOR ) );
}
public CommandLine parse( String[] args ) throws ParseException
{
CommandLineParser parser = new PosixParser();
return parser.parse( options, args );
}
public void displayHelp()
{
HelpFormatter formatter = new HelpFormatter();
formatter.printHelp( "maven [options] [goal [goal2 [goal3] ...]]", "\nOptions:", options, "\n" );
}
}
}
1.1 maven-components/maven-core/src/main/java/org/apache/maven/cli/MavenConstants.java
Index: MavenConstants.java
===================================================================
package org.apache.maven.cli;
/*
* 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.
*/
public class MavenConstants
{
// TODO: remove? only used in CLI for now - once set, never used
public static final String DEBUG_ON = "maven.debug.on";
}
1.1 maven-components/maven-core/src/main/java/org/apache/maven/exception/MavenExceptionHandler.java
Index: MavenExceptionHandler.java
===================================================================
package org.apache.maven.exception;
/*
* 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/12/05 04:16:03 jvanzyl Exp $
*/
public class MavenExceptionHandler
{
}
1.1 maven-components/maven-core/src/main/java/org/apache/maven/exception/MavenHomeNotDefinedException.java
Index: MavenHomeNotDefinedException.java
===================================================================
package org.apache.maven.exception;
/*
* 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.
*/
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id: MavenHomeNotDefinedException.java,v 1.1 2004/12/05 04:16:03 jvanzyl Exp $
*/
public class MavenHomeNotDefinedException
extends Exception
{
public MavenHomeNotDefinedException( String message )
{
super( message );
}
public MavenHomeNotDefinedException( Throwable cause )
{
super( cause );
}
public MavenHomeNotDefinedException( String message, Throwable cause )
{
super( message, cause );
}
}
1.3 +1 -1 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/DependencyDownloadPhase.java
Index: DependencyDownloadPhase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/DependencyDownloadPhase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
1.5 +1 -1 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/DependencyResolutionPhase.java
Index: DependencyResolutionPhase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/DependencyResolutionPhase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
1.6 +1 -1 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/GoalAttainmentPhase.java
Index: GoalAttainmentPhase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/GoalAttainmentPhase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
1.5 +0 -0 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/GoalMappingPhase.java
Index: GoalMappingPhase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/GoalMappingPhase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
1.7 +1 -1 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/GoalResolutionPhase.java
Index: GoalResolutionPhase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/GoalResolutionPhase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
1.3 +0 -0 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/PluginResolutionPhase.java
Index: PluginResolutionPhase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/PluginResolutionPhase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
1.2 +1 -1 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/AbstractMavenGoalPhase.java
Index: AbstractMavenGoalPhase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/AbstractMavenGoalPhase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +1 -1 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/DefaultMavenGoalPhaseManager.java
Index: DefaultMavenGoalPhaseManager.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/DefaultMavenGoalPhaseManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +1 -1 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/GoalExecutionException.java
Index: GoalExecutionException.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/GoalExecutionException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.3 +0 -0 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/GoalNotFoundException.java
Index: GoalNotFoundException.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/GoalNotFoundException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
1.5 +0 -0 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/MavenGoalExecutionContext.java
Index: MavenGoalExecutionContext.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/MavenGoalExecutionContext.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
1.3 +1 -1 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/MavenGoalPhase.java
Index: MavenGoalPhase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/MavenGoalPhase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
1.3 +1 -1 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/MavenGoalPhaseManager.java
Index: MavenGoalPhaseManager.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/MavenGoalPhaseManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
1.5 +1 -1 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/session/phase/GoalExecutionPhase.java
Index: GoalExecutionPhase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/session/phase/GoalExecutionPhase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
1.4 +1 -1 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/session/AbstractMavenSessionPhase.java
Index: AbstractMavenSessionPhase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/session/AbstractMavenSessionPhase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
1.5 +1 -1 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/session/DefaultMavenSessionPhaseManager.java
Index: DefaultMavenSessionPhaseManager.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/session/DefaultMavenSessionPhaseManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
1.6 +1 -1 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/session/MavenSession.java
Index: MavenSession.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/session/MavenSession.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
1.4 +1 -1 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/session/MavenSessionPhase.java
Index: MavenSessionPhase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/session/MavenSessionPhase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
1.4 +1 -1 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/session/MavenSessionPhaseManager.java
Index: MavenSessionPhaseManager.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/session/MavenSessionPhaseManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
1.19 +0 -0 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
1.2 +1 -1 maven-components/maven-core/src/main/java/org/apache/maven/plugin/MavenMojoDescriptor.java
Index: MavenMojoDescriptor.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/MavenMojoDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +1 -1 maven-components/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDependency.java
Index: MavenPluginDependency.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDependency.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +1 -1 maven-components/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDescriptor.java
Index: MavenPluginDescriptor.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +1 -1 maven-components/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDiscoverer.java
Index: MavenPluginDiscoverer.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDiscoverer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.12 +1 -1 maven-components/maven-core/src/main/java/org/apache/maven/plugin/OgnlProjectValueExtractor.java
Index: OgnlProjectValueExtractor.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/OgnlProjectValueExtractor.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
1.2 +1 -1 maven-components/maven-core/src/main/java/org/apache/maven/plugin/PluginConfigurationException.java
Index: PluginConfigurationException.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/PluginConfigurationException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.5 +1 -1 maven-components/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
Index: PluginManager.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
1.12 +0 -0 maven-components/maven-core/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
Index: DefaultModelInheritanceAssembler.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
1.2 +1 -1 maven-components/maven-core/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java
Index: ModelInheritanceAssembler.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.3 +0 -0 maven-components/maven-core/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java
Index: DefaultPathTranslator.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
1.2 +1 -1 maven-components/maven-core/src/main/java/org/apache/maven/project/path/PathTranslator.java
Index: PathTranslator.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/project/path/PathTranslator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +1 -1 maven-components/maven-core/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
Index: DefaultModelValidator.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +1 -1 maven-components/maven-core/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java
Index: ModelValidationResult.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +1 -1 maven-components/maven-core/src/main/java/org/apache/maven/project/validation/ModelValidator.java
Index: ModelValidator.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/project/validation/ModelValidator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.10 +0 -0 maven-components/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
Index: MavenProject.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/project/MavenProject.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
1.5 +0 -0 maven-components/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
Index: MavenProjectBuilder.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
1.2 +1 -1 maven-components/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuildingResult.java
Index: MavenProjectBuildingResult.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuildingResult.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +1 -1 maven-components/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java
Index: ProjectBuildingException.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.1 maven-components/maven-core/src/main/java/org/apache/maven/reactor/ReactorException.java
Index: ReactorException.java
===================================================================
package org.apache.maven.reactor;
/*
* 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.
*/
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id: ReactorException.java,v 1.1 2004/12/05 04:16:04 jvanzyl Exp $
*/
public class ReactorException
extends Exception
{
public ReactorException()
{
}
public ReactorException( String message )
{
super( message );
}
public ReactorException( Throwable cause )
{
super( cause );
}
public ReactorException( String message, Throwable cause )
{
super( message, cause );
}
}
1.3 +1 -1 maven-components/maven-core/src/main/java/org/apache/maven/repository/RepositoryUtils.java
Index: RepositoryUtils.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/repository/RepositoryUtils.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
1.3 +0 -0 maven-components/maven-core/src/main/java/org/apache/maven/util/AbstractGoalVisitor.java
Index: AbstractGoalVisitor.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/util/AbstractGoalVisitor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
1.3 +0 -0 maven-components/maven-core/src/main/java/org/apache/maven/util/GoalVisitor.java
Index: GoalVisitor.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/util/GoalVisitor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
1.3 +0 -0 maven-components/maven-core/src/main/java/org/apache/maven/util/GoalWalker.java
Index: GoalWalker.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/util/GoalWalker.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
1.3 +0 -0 maven-components/maven-core/src/main/java/org/apache/maven/util/GraphTraversalException.java
Index: GraphTraversalException.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/util/GraphTraversalException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
1.14 +1 -0 maven-components/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Index: DefaultMaven.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/DefaultMaven.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DefaultMaven.java 8 Oct 2004 19:15:01 -0000 1.13
+++ DefaultMaven.java 5 Dec 2004 04:16:04 -0000 1.14
@@ -32,6 +32,7 @@
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
+import org.apache.maven.reactor.ReactorException;
import org.codehaus.plexus.ArtifactEnabledContainer;
import org.codehaus.plexus.PlexusConstants;
1.3 +1 -1 maven-components/maven-core/src/main/java/org/apache/maven/ExecutionResponse.java
Index: ExecutionResponse.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/ExecutionResponse.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
1.7 +2 -1 maven-components/maven-core/src/main/java/org/apache/maven/Maven.java
Index: Maven.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/Maven.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Maven.java 8 Oct 2004 19:15:01 -0000 1.6
+++ Maven.java 5 Dec 2004 04:16:04 -0000 1.7
@@ -20,6 +20,7 @@
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingException;
+import org.apache.maven.reactor.ReactorException;
import java.io.File;
import java.util.List;
1.5 +0 -0 maven-components/maven-core/src/main/resources/META-INF/plexus/components.xml
Index: components.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/resources/META-INF/plexus/components.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
1.3 +0 -0 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
1.2 +0 -0 maven-components/maven-core/src/main/resources/org/apache/maven/messages/messages_el.properties
Index: messages_el.properties
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/resources/org/apache/maven/messages/messages_el.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/main/resources/org/apache/maven/messages/messages_en.properties
Index: messages_en.properties
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/resources/org/apache/maven/messages/messages_en.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/main/resources/org/apache/maven/messages/messages_es.properties
Index: messages_es.properties
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/resources/org/apache/maven/messages/messages_es.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/main/resources/org/apache/maven/messages/messages_fr.properties
Index: messages_fr.properties
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/resources/org/apache/maven/messages/messages_fr.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/main/resources/org/apache/maven/messages/messages_nl.properties
Index: messages_nl.properties
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/resources/org/apache/maven/messages/messages_nl.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/main/resources/org/apache/maven/messages/messages_no.properties
Index: messages_no.properties
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/resources/org/apache/maven/messages/messages_no.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/main/resources/org/apache/maven/messages/messages_pl.properties
Index: messages_pl.properties
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/resources/org/apache/maven/messages/messages_pl.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/main/resources/org/apache/maven/messages/messages_zh_CN.properties
Index: messages_zh_CN.properties
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/resources/org/apache/maven/messages/messages_zh_CN.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.3 +0 -0 maven-components/maven-core/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
Index: pom-4.0.0.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/resources/org/apache/maven/project/pom-4.0.0.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
1.2 +0 -0 maven-components/maven-core/src/site/apt/configuration-management.apt
Index: configuration-management.apt
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/site/apt/configuration-management.apt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/site/apt/faq.apt
Index: faq.apt
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/site/apt/faq.apt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/site/apt/goal-resolution.apt
Index: goal-resolution.apt
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/site/apt/goal-resolution.apt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/site/apt/index.apt
Index: index.apt
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/site/apt/index.apt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.4 +0 -0 maven-components/maven-core/src/site/apt/inheritance.apt
Index: inheritance.apt
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/site/apt/inheritance.apt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
1.4 +3 -0 maven-components/maven-core/src/site/apt/install.apt
Index: install.apt
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/site/apt/install.apt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- install.apt 23 Sep 2004 15:04:30 -0000 1.3
+++ install.apt 5 Dec 2004 04:16:05 -0000 1.4
@@ -6,6 +6,9 @@
Installing maven2
+ *
+
+
* Download m2 {{{http://www.apache.org/~jvanzyl/m2/m2.tgz}here}}.
* Unpack in your home directory. In will expand in a directory called <<<m2>>>.
1.27 +0 -0 maven-components/maven-core/src/site/apt/lifecycle.apt
Index: lifecycle.apt
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/site/apt/lifecycle.apt,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
1.3 +0 -0 maven-components/maven-core/src/site/apt/mojos.apt
Index: mojos.apt
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/site/apt/mojos.apt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
1.2 +0 -0 maven-components/maven-core/src/site/apt/plugin-descriptors.apt
Index: plugin-descriptors.apt
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/site/apt/plugin-descriptors.apt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/site/apt/plugin-execution-isolation.apt
Index: plugin-execution-isolation.apt
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/site/apt/plugin-execution-isolation.apt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/site/apt/plugins.apt
Index: plugins.apt
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/site/apt/plugins.apt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/site/apt/repository-upload.apt
Index: repository-upload.apt
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/site/apt/repository-upload.apt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.4 +0 -0 maven-components/maven-core/src/site/site.xml
Index: site.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/site/site.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
1.4 +0 -0 maven-components/maven-core/src/test/java/org/apache/maven/lifecycle/goal/phase/GoalAssemblySubProcessTest.java
Index: GoalAssemblySubProcessTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/lifecycle/goal/phase/GoalAssemblySubProcessTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
1.5 +0 -0 maven-components/maven-core/src/test/java/org/apache/maven/lifecycle/MavenLifecycleManagerTest.java
Index: MavenLifecycleManagerTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/lifecycle/MavenLifecycleManagerTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
1.2 +1 -1 maven-components/maven-core/src/test/java/org/apache/maven/plugin/AbstractTestPlugin.java
Index: AbstractTestPlugin.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/plugin/AbstractTestPlugin.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/java/org/apache/maven/plugin/GoalDecorationAndResolutionTestPlugin.java
Index: GoalDecorationAndResolutionTestPlugin.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/plugin/GoalDecorationAndResolutionTestPlugin.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +1 -1 maven-components/maven-core/src/test/java/org/apache/maven/plugin/IntegratedPlugin.java
Index: IntegratedPlugin.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/plugin/IntegratedPlugin.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.7 +1 -1 maven-components/maven-core/src/test/java/org/apache/maven/plugin/OgnlProjectValueExtractorTest.java
Index: OgnlProjectValueExtractorTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/plugin/OgnlProjectValueExtractorTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
1.3 +1 -1 maven-components/maven-core/src/test/java/org/apache/maven/plugin/PluginTest.java
Index: PluginTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/plugin/PluginTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
1.4 +1 -1 maven-components/maven-core/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
Index: CanonicalProjectBuilderTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
1.4 +1 -1 maven-components/maven-core/src/test/java/org/apache/maven/project/helpers/ProjectTestHelper.java
Index: ProjectTestHelper.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/project/helpers/ProjectTestHelper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
1.5 +1 -1 maven-components/maven-core/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java
Index: ProjectInheritanceTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
1.6 +1 -1 maven-components/maven-core/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java
Index: ProjectInheritanceTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
1.8 +0 -0 maven-components/maven-core/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java
Index: DefaultModelInheritanceAssemblerTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
1.6 +1 -1 maven-components/maven-core/src/test/java/org/apache/maven/project/inheritance/ProjectInheritanceTestCase.java
Index: ProjectInheritanceTestCase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/project/inheritance/ProjectInheritanceTestCase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
1.3 +1 -1 maven-components/maven-core/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java
Index: DefaultModelValidatorTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
1.6 +0 -0 maven-components/maven-core/src/test/java/org/apache/maven/project/AbstractProjectTestCase.java
Index: AbstractProjectTestCase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/project/AbstractProjectTestCase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
1.5 +0 -0 maven-components/maven-core/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java
Index: ProjectBaseDirectoryAlignmentTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
1.10 +2 -1 maven-components/maven-core/src/test/java/org/apache/maven/MavenTestCase.java
Index: MavenTestCase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/MavenTestCase.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- MavenTestCase.java 8 Oct 2004 19:15:01 -0000 1.9
+++ MavenTestCase.java 5 Dec 2004 04:16:05 -0000 1.10
@@ -59,6 +59,7 @@
}
testRepoUrl = testRepoLocation.toURL().toExternalForm();
+
testRepoUrl = testRepoUrl.substring( 0, testRepoUrl.length() - 1 );
pluginManager = (PluginManager) lookup( PluginManager.ROLE );
1.1 maven-components/maven-core/src/test/java/org/apache/maven/MavenTestUtils.java
Index: MavenTestUtils.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.
*/
import java.io.File;
import org.codehaus.classworlds.ClassRealm;
import org.codehaus.classworlds.ClassWorld;
import org.codehaus.plexus.DefaultArtifactEnabledContainer;
import org.codehaus.plexus.PlexusContainer;
/**
* This is a utility class for helping to configure a PlexusTestCase for testing with maven.
*
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id: MavenTestUtils.java,v 1.1 2004/12/05 04:16:05 jvanzyl Exp $
*/
public class MavenTestUtils
{
private MavenTestUtils()
{
}
public static PlexusContainer getContainerInstance()
{
return new DefaultArtifactEnabledContainer();
}
public static void customizeContext( PlexusContainer container, File basedir, File mavenHome, File mavenHomeLocal )
throws Exception
{
ClassWorld classWorld = new ClassWorld();
ClassRealm rootClassRealm = classWorld.newRealm( "root", Thread.currentThread().getContextClassLoader() );
container.addContextValue( "rootClassRealm", rootClassRealm );
container.addContextValue( "maven.home", mavenHome.getAbsolutePath() );
container.addContextValue( "maven.home.local", mavenHomeLocal.getAbsolutePath() );
}
}
1.3 +0 -0 maven-components/maven-core/src/test/resources/META-INF/maven/plugin.xml
Index: plugin.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/META-INF/maven/plugin.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
1.2 +0 -0 maven-components/maven-core/src/test/resources/inheritance-repo/t00/maven/poms/p0-1.0.pom
Index: p0-1.0.pom
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/inheritance-repo/t00/maven/poms/p0-1.0.pom,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/inheritance-repo/t00/maven/poms/p1-1.0.pom
Index: p1-1.0.pom
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/inheritance-repo/t00/maven/poms/p1-1.0.pom,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/inheritance-repo/t00/maven/poms/p2-1.0.pom
Index: p2-1.0.pom
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/inheritance-repo/t00/maven/poms/p2-1.0.pom,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/inheritance-repo/t00/maven/poms/p3-1.0.pom
Index: p3-1.0.pom
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/inheritance-repo/t00/maven/poms/p3-1.0.pom,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/inheritance-repo/t00/maven/poms/p4-1.0.pom
Index: p4-1.0.pom
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/inheritance-repo/t00/maven/poms/p4-1.0.pom,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/inheritance-repo/t01/maven/poms/p0-1.0.pom
Index: p0-1.0.pom
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/inheritance-repo/t01/maven/poms/p0-1.0.pom,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/inheritance-repo/t01/maven/poms/p1-1.0.pom
Index: p1-1.0.pom
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/inheritance-repo/t01/maven/poms/p1-1.0.pom,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/inheritance-repo/t01/maven/poms/p2-1.0.pom
Index: p2-1.0.pom
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/inheritance-repo/t01/maven/poms/p2-1.0.pom,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/inheritance-repo/t01/maven/poms/p3-1.0.pom
Index: p3-1.0.pom
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/inheritance-repo/t01/maven/poms/p3-1.0.pom,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/inheritance-repo/t01/maven/poms/p4-1.0.pom
Index: p4-1.0.pom
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/inheritance-repo/t01/maven/poms/p4-1.0.pom,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/local-repo/maven-test/jars/maven-test-a-1.0.jar
Index: maven-test-a-1.0.jar
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/local-repo/maven-test/jars/maven-test-a-1.0.jar,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/local-repo/maven-test/jars/maven-test-b-1.0.jar
Index: maven-test-b-1.0.jar
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/local-repo/maven-test/jars/maven-test-b-1.0.jar,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/local-repo/maven-test/jars/maven-test-c-1.0.jar
Index: maven-test-c-1.0.jar
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/local-repo/maven-test/jars/maven-test-c-1.0.jar,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/local-repo/maven-test/jars/maven-test-d-1.0.jar
Index: maven-test-d-1.0.jar
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/local-repo/maven-test/jars/maven-test-d-1.0.jar,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-a-1.0.pom
Index: maven-test-a-1.0.pom
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-a-1.0.pom,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-b-1.0.pom
Index: maven-test-b-1.0.pom
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-b-1.0.pom,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-c-1.0.pom
Index: maven-test-c-1.0.pom
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-c-1.0.pom,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.1.pom
Index: maven-test-d-1.1.pom
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.1.pom,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.2.pom
Index: maven-test-d-1.2.pom
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.2.pom,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar
Index: maven-snapshot-a-1.0-SNAPSHOT.jar
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar.snapshot-version
Index: maven-snapshot-a-1.0-SNAPSHOT.jar.snapshot-version
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar.snapshot-version,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar
Index: maven-snapshot-b-1.0-SNAPSHOT.jar
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar.snapshot-version
Index: maven-snapshot-b-1.0-SNAPSHOT.jar.snapshot-version
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar.snapshot-version,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar
Index: maven-snapshot-e-1.0-SNAPSHOT.jar
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar.snapshot-version
Index: maven-snapshot-e-1.0-SNAPSHOT.jar.snapshot-version
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar.snapshot-version,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/local-repo/snapshot-test/poms/maven-test-snapshot-resolving-1.0.pom
Index: maven-test-snapshot-resolving-1.0.pom
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/local-repo/snapshot-test/poms/maven-test-snapshot-resolving-1.0.pom,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/org/apache/maven/artifact/manager/DefaultWagonManagerTest.xml
Index: DefaultWagonManagerTest.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/org/apache/maven/artifact/manager/DefaultWagonManagerTest.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/org/apache/maven/plugin/integrated-plugin.xml
Index: integrated-plugin.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/org/apache/maven/plugin/integrated-plugin.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/projects/base-directory-alignment/subproject/project-which-needs-directory-alignment-child.xml
Index: project-which-needs-directory-alignment-child.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/projects/base-directory-alignment/subproject/project-which-needs-directory-alignment-child.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment-child.xml
Index: project-which-needs-directory-alignment-child.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment-child.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment.xml
Index: project-which-needs-directory-alignment.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/projects/bad-project.xml
Index: bad-project.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/projects/bad-project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/projects/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/projects/build.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/projects/child-which-inherits-from-super-model.xml
Index: child-which-inherits-from-super-model.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/projects/child-which-inherits-from-super-model.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/projects/child-with-bogus-parent.xml
Index: child-with-bogus-parent.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/projects/child-with-bogus-parent.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/projects/child.xml
Index: child.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/projects/child.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/projects/fully-populated-child.xml
Index: fully-populated-child.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/projects/fully-populated-child.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/projects/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/projects/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/remote-repo-1/maven-test/jars/maven-test-b-1.0.jar
<<Binary file>>
1.2 +0 -0 maven-components/maven-core/src/test/resources/remote-repo-1/maven-test/jars/maven-test-b-1.0.jar.md5
Index: maven-test-b-1.0.jar.md5
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/remote-repo-1/maven-test/jars/maven-test-b-1.0.jar.md5,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/remote-repo-1/maven-test/poms/maven-test-b-1.0.pom
Index: maven-test-b-1.0.pom
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/remote-repo-1/maven-test/poms/maven-test-b-1.0.pom,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar
Index: maven-snapshot-a-1.0-SNAPSHOT.jar
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar.snapshot-version
Index: maven-snapshot-a-1.0-SNAPSHOT.jar.snapshot-version
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar.snapshot-version,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar
Index: maven-snapshot-b-1.0-SNAPSHOT.jar
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar.snapshot-version
Index: maven-snapshot-b-1.0-SNAPSHOT.jar.snapshot-version
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar.snapshot-version,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-c-1.0-SNAPSHOT.jar
Index: maven-snapshot-c-1.0-SNAPSHOT.jar
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-c-1.0-SNAPSHOT.jar,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +1 -1 maven-components/maven-core/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-c-1.0-SNAPSHOT.jar.snapshot-version
Index: maven-snapshot-c-1.0-SNAPSHOT.jar.snapshot-version
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-c-1.0-SNAPSHOT.jar.snapshot-version,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven-snapshot-c-1.0-SNAPSHOT.jar.snapshot-version 9 Aug 2004 19:02:40 -0000 1.1
+++ maven-snapshot-c-1.0-SNAPSHOT.jar.snapshot-version 5 Dec 2004 04:16:07 -0000 1.2
@@ -1 +1 @@
-20040101.101010
+20040101.101010
1.2 +0 -0 maven-components/maven-core/src/test/resources/remote-repo-2/maven-test/jars/maven-test-z-1.0.jar
Index: maven-test-z-1.0.jar
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/remote-repo-2/maven-test/jars/maven-test-z-1.0.jar,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/validation/missing-1-pom.xml
Index: missing-1-pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/validation/missing-1-pom.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/validation/missing-artifactId-pom.xml
Index: missing-artifactId-pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/validation/missing-artifactId-pom.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/validation/missing-groupId-pom.xml
Index: missing-groupId-pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/validation/missing-groupId-pom.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/validation/missing-modelVersion-pom.xml
Index: missing-modelVersion-pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/validation/missing-modelVersion-pom.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/validation/missing-type-pom.xml
Index: missing-type-pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/validation/missing-type-pom.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/test/resources/validation/missing-version-pom.xml
Index: missing-version-pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/validation/missing-version-pom.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.4 +0 -0 maven-components/maven-core/src/test/resources/canonical-pom.xml
Index: canonical-pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/canonical-pom.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
1.2 +0 -0 maven-components/maven-core/src/test/resources/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/pom.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/src/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/maven-components/maven-core/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/LICENSE.txt
Index: LICENSE.txt
===================================================================
RCS file: /home/cvs/maven-components/maven-core/LICENSE.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/NOTICE.txt
Index: NOTICE.txt
===================================================================
RCS file: /home/cvs/maven-components/maven-core/NOTICE.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/README.txt
Index: README.txt
===================================================================
RCS file: /home/cvs/maven-components/maven-core/README.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/checkstyle-license.txt
Index: checkstyle-license.txt
===================================================================
RCS file: /home/cvs/maven-components/maven-core/checkstyle-license.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 maven-components/maven-core/deploy-site
Index: deploy-site
===================================================================
RCS file: /home/cvs/maven-components/maven-core/deploy-site,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.3 +0 -0 maven-components/maven-core/plugin-notes.txt
Index: plugin-notes.txt
===================================================================
RCS file: /home/cvs/maven-components/maven-core/plugin-notes.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
1.13 +0 -0 maven-components/maven-core/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/pom.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
|