You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/06/21 08:49:54 UTC
svn commit: r191634 [2/2] - in /maven/components/trunk: ./ benchmark/
maven-archetype/maven-archetype-core/
maven-archetype/maven-archetype-core/src/test/java/org/apache/maven/archetype/
maven-archiver/ maven-artifact-ant/ maven-artifact-ant/src/main/j...
Modified: maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml Mon Jun 20 23:49:49 2005
@@ -1,98 +1,5 @@
<component-set>
<components>
- <!--
- |
- | WagonManager
- |
- -->
- <component>
- <role>org.apache.maven.artifact.manager.WagonManager</role>
- <implementation>org.apache.maven.artifact.manager.DefaultWagonManager</implementation>
- </component>
-
- <!--
- |
- | Transformations
- |
- -->
- <component>
- <role>org.apache.maven.artifact.transform.ArtifactTransformation</role>
- <role-hint>snapshot</role-hint>
- <implementation>org.apache.maven.artifact.transform.SnapshotTransformation</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.artifact.manager.WagonManager</role>
- </requirement>
- </requirements>
- </component>
-
- <component>
- <role>org.apache.maven.artifact.transform.ArtifactTransformation</role>
- <role-hint>release</role-hint>
- <implementation>org.apache.maven.artifact.transform.ReleaseArtifactTransformation</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.artifact.manager.WagonManager</role>
- </requirement>
- </requirements>
- </component>
- <!--
- |
- | Resolver
- |
- -->
- <component>
- <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
- <implementation>org.apache.maven.artifact.resolver.DefaultArtifactResolver</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.artifact.manager.WagonManager</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.artifact.transform.ArtifactTransformation</role>
- <field-name>artifactTransformations</field-name>
- </requirement>
- <requirement>
- <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
- </requirement>
- </requirements>
- </component>
-
- <!--
- |
- | ArtifactInstaller
- |
- -->
- <component>
- <role>org.apache.maven.artifact.installer.ArtifactInstaller</role>
- <implementation>org.apache.maven.artifact.installer.DefaultArtifactInstaller</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.artifact.transform.ArtifactTransformation</role>
- <field-name>artifactTransformations</field-name>
- </requirement>
- </requirements>
- </component>
-
- <!--
- |
- | ArtifactDeployer
- |
- -->
- <component>
- <role>org.apache.maven.artifact.deployer.ArtifactDeployer</role>
- <implementation>org.apache.maven.artifact.deployer.DefaultArtifactDeployer</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.artifact.manager.WagonManager</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.artifact.transform.ArtifactTransformation</role>
- <field-name>artifactTransformations</field-name>
- </requirement>
- </requirements>
- </component>
-
<component>
<role>org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout</role>
<role-hint>default</role-hint>
@@ -214,6 +121,11 @@
<component>
<role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
<implementation>org.apache.maven.artifact.repository.DefaultArtifactRepositoryFactory</implementation>
+ </component>
+
+ <component>
+ <role>org.apache.maven.artifact.resolver.ArtifactCollector</role>
+ <implementation>org.apache.maven.artifact.resolver.DefaultArtifactCollector</implementation>
</component>
</components>
</component-set>
Modified: maven/components/trunk/maven-core/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/pom.xml?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-core/pom.xml (original)
+++ maven/components/trunk/maven-core/pom.xml Mon Jun 20 23:49:49 2005
@@ -56,6 +56,12 @@
<artifactId>maven-artifact</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
+ <!-- TODO: make it runtime by removing new DefaultArtifactRepository and WagonManager -->
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact-manager</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java Mon Jun 20 23:49:49 2005
@@ -46,6 +46,7 @@
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException;
import org.codehaus.plexus.context.Context;
import org.codehaus.plexus.context.ContextException;
import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -104,6 +105,10 @@
{
throw new ReactorException( "Unable to configure Maven for execution", e );
}
+ catch ( ComponentLifecycleException e )
+ {
+ throw new ReactorException( "Unable to configure Maven for execution", e );
+ }
EventDispatcher dispatcher = request.getEventDispatcher();
String event = MavenEvents.REACTOR_EXECUTION;
@@ -398,31 +403,38 @@
* the wagons, shouldn't we?
*/
private void resolveParameters( Settings settings )
- throws ComponentLookupException
+ throws ComponentLookupException, ComponentLifecycleException
{
WagonManager wagonManager = (WagonManager) container.lookup( WagonManager.ROLE );
- Proxy proxy = settings.getActiveProxy();
-
- if ( proxy != null )
+ try
{
- wagonManager.addProxy( proxy.getProtocol(), proxy.getHost(), proxy.getPort(), proxy.getUsername(),
- proxy.getPassword(), proxy.getNonProxyHosts() );
- }
+ Proxy proxy = settings.getActiveProxy();
- for ( Iterator i = settings.getServers().iterator(); i.hasNext(); )
- {
- Server server = (Server) i.next();
+ if ( proxy != null )
+ {
+ wagonManager.addProxy( proxy.getProtocol(), proxy.getHost(), proxy.getPort(), proxy.getUsername(),
+ proxy.getPassword(), proxy.getNonProxyHosts() );
+ }
- wagonManager.addAuthenticationInfo( server.getId(), server.getUsername(), server.getPassword(),
- server.getPrivateKey(), server.getPassphrase() );
- }
+ for ( Iterator i = settings.getServers().iterator(); i.hasNext(); )
+ {
+ Server server = (Server) i.next();
- for ( Iterator i = settings.getMirrors().iterator(); i.hasNext(); )
- {
- Mirror mirror = (Mirror) i.next();
+ wagonManager.addAuthenticationInfo( server.getId(), server.getUsername(), server.getPassword(),
+ server.getPrivateKey(), server.getPassphrase() );
+ }
- wagonManager.addMirror( mirror.getId(), mirror.getMirrorOf(), mirror.getUrl() );
+ for ( Iterator i = settings.getMirrors().iterator(); i.hasNext(); )
+ {
+ Mirror mirror = (Mirror) i.next();
+
+ wagonManager.addMirror( mirror.getId(), mirror.getMirrorOf(), mirror.getUrl() );
+ }
+ }
+ finally
+ {
+ container.release( wagonManager );
}
}
@@ -596,7 +608,7 @@
{
msg += "1 second";
}
- else if ( min > 0 )
+ else if ( min == 0 )
{
msg += "< 1 second";
}
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java Mon Jun 20 23:49:49 2005
@@ -25,8 +25,9 @@
import org.apache.commons.cli.PosixParser;
import org.apache.maven.Maven;
import org.apache.maven.artifact.manager.WagonManager;
-import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.DefaultArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
+import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
import org.apache.maven.execution.DefaultMavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionRequest;
@@ -376,7 +377,7 @@
ArtifactRepositoryFactory.ROLE );
String url = "file://" + settings.getLocalRepository();
- ArtifactRepository localRepository = new ArtifactRepository( "local", url, repositoryLayout );
+ ArtifactRepository localRepository = new DefaultArtifactRepository( "local", url, repositoryLayout );
boolean snapshotPolicySet = false;
if ( commandLine.hasOption( CLIManager.OFFLINE ) )
Modified: maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java (original)
+++ maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java Mon Jun 20 23:49:49 2005
@@ -18,6 +18,7 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
+import org.apache.maven.artifact.repository.DefaultArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
import org.apache.maven.execution.MavenSession;
@@ -77,7 +78,7 @@
ExpressionEvaluator expressionEvaluator = createExpressionEvaluator( createDefaultProject(), null );
Object value = expressionEvaluator.evaluate( "${localRepository}" );
- assertEquals( "local", ( (ArtifactRepository) value ).getId() );
+ assertEquals( "local", ( (DefaultArtifactRepository) value ).getId() );
}
public void testTwoExpressions()
@@ -132,7 +133,7 @@
ArtifactRepositoryLayout repoLayout = (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE,
"legacy" );
- ArtifactRepository repo = new ArtifactRepository( "local", "target/repo", repoLayout );
+ ArtifactRepository repo = new DefaultArtifactRepository( "local", "target/repo", repoLayout );
PlexusContainer container = getContainer();
MavenSession session = createSession( project, container, repo );
Modified: maven/components/trunk/maven-mboot2/src/main/java/MBoot.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-mboot2/src/main/java/MBoot.java?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-mboot2/src/main/java/MBoot.java (original)
+++ maven/components/trunk/maven-mboot2/src/main/java/MBoot.java Mon Jun 20 23:49:49 2005
@@ -1,4 +1,3 @@
-
import compile.CompilerConfiguration;
import compile.JavacCompiler;
import download.ArtifactDownloader;
@@ -35,28 +34,23 @@
public class MBoot
{
- String[] builds = new String[]{"maven-model", "maven-monitor", "maven-plugin-api",
- "maven-plugin-descriptor", "maven-artifact", "maven-script/maven-script-marmalade",
- "maven-script/maven-script-beanshell", "maven-project",
- "maven-settings", "maven-profile", "maven-plugin-registry",
- "maven-reporting/maven-reporting-api", "maven-core", "maven-archiver",
- "maven-plugin-tools/maven-plugin-tools-api",
- "maven-plugin-tools/maven-plugin-tools-java",
- "maven-plugin-tools/maven-plugin-tools-beanshell",
- "maven-plugin-tools/maven-plugin-tools-pluggy",
- "maven-plugin-tools/maven-plugin-tools-marmalade", "maven-core-it-verifier"};
+ String[] builds = new String[]{"maven-model", "maven-monitor", "maven-plugin-api", "maven-plugin-descriptor",
+ "maven-artifact", "maven-artifact-manager", "maven-artifact-test", "maven-script/maven-script-marmalade",
+ "maven-script/maven-script-beanshell", "maven-project", "maven-settings", "maven-profile",
+ "maven-plugin-registry", "maven-reporting/maven-reporting-api", "maven-core", "maven-archiver",
+ "maven-plugin-tools/maven-plugin-tools-api", "maven-plugin-tools/maven-plugin-tools-java",
+ "maven-plugin-tools/maven-plugin-tools-beanshell", "maven-plugin-tools/maven-plugin-tools-pluggy",
+ "maven-plugin-tools/maven-plugin-tools-marmalade", "maven-core-it-verifier"};
String[] pluginBuilds = new String[]{"maven-plugins/maven-clean-plugin", "maven-plugins/maven-compiler-plugin",
- "maven-plugins/maven-install-plugin", "maven-plugins/maven-jar-plugin",
- "maven-plugins/maven-plugin-plugin", "maven-plugins/maven-resources-plugin",
- "maven-plugins/maven-surefire-plugin"};
+ "maven-plugins/maven-install-plugin", "maven-plugins/maven-jar-plugin", "maven-plugins/maven-plugin-plugin",
+ "maven-plugins/maven-resources-plugin", "maven-plugins/maven-surefire-plugin"};
private static final Map MODELLO_TARGET_VERSIONS;
private static final Map MODELLO_MODEL_FILES;
- static
- {
+ static {
Map targetVersions = new TreeMap();
targetVersions.put( "maven-model", "4.0.0" );
targetVersions.put( "maven-settings", "1.0.0" );
@@ -182,8 +176,9 @@
System.out.println();
- System.out.println( "HOWEVER, since you did not specify a repository path, maven will use: " +
- repoDir.getAbsolutePath() + " to store artifacts locally." );
+ System.out.println(
+ "HOWEVER, since you did not specify a repository path, maven will use: " + repoDir.getAbsolutePath() +
+ " to store artifacts locally." );
}
File repoLocalFile = new File( mavenRepoLocal );
@@ -220,11 +215,13 @@
{
if ( !new File( dist, "bin/m2.conf" ).exists() )
{
- System.err.println( "The directory given to install Maven in already exists, but does not contain a Maven installation" );
+ System.err.println(
+ "The directory given to install Maven in already exists, but does not contain a Maven installation" );
System.err.println();
System.err.println( "\t" + dist );
System.err.println();
- System.err.println( "If you really mean to install Maven to this location, please delete the directory first" );
+ System.err.println(
+ "If you really mean to install Maven to this location, please delete the directory first" );
System.exit( 1 );
}
}
@@ -435,8 +432,8 @@
{
FileUtils.copyFileToDirectory( source, boot );
}
- else if ( d.getArtifactId().equals( "plexus-container-default" )
- || d.getArtifactId().equals( "plexus-utils" ) )
+ else if ( d.getArtifactId().equals( "plexus-container-default" ) ||
+ d.getArtifactId().equals( "plexus-utils" ) )
{
FileUtils.copyFileToDirectory( source, core );
}
@@ -589,7 +586,8 @@
}
else
{
- compile( reader.getDependencies(), sources, classes, null, null, Dependency.SCOPE_COMPILE, localRepository );
+ compile( reader.getDependencies(), sources, classes, null, null, Dependency.SCOPE_COMPILE,
+ localRepository );
}
// ----------------------------------------------------------------------
@@ -663,8 +661,8 @@
m.invoke( null, new Object[]{args} );
}
- private void generateSources( String model, String mode, String dir, String modelVersion,
- String packageWithVersion, ClassLoader modelloClassLoader )
+ private void generateSources( String model, String mode, String dir, String modelVersion, String packageWithVersion,
+ ClassLoader modelloClassLoader )
throws Exception
{
Class c = modelloClassLoader.loadClass( "org.codehaus.modello.ModelloCli" );
@@ -856,7 +854,8 @@
}
else if ( Dependency.SCOPE_RUNTIME.equals( scope ) )
{
- if ( d.getScope().equals( Dependency.SCOPE_COMPILE ) || d.getScope().equals( Dependency.SCOPE_RUNTIME ) )
+ if ( d.getScope().equals( Dependency.SCOPE_COMPILE ) ||
+ d.getScope().equals( Dependency.SCOPE_RUNTIME ) )
{
classpath.add( element );
}
@@ -986,9 +985,9 @@
private Proxy activeProxy = null;
private Mirror currentMirror;
-
+
private String localRepository;
-
+
public String getLocalRepository()
{
return localRepository;
@@ -1016,8 +1015,8 @@
}
else
{
- throw new SAXException( "Invalid profile entry. Missing one or more " +
- "fields: {localRepository}." );
+ throw new SAXException(
+ "Invalid profile entry. Missing one or more " + "fields: {localRepository}." );
}
}
else if ( "proxy".equals( rawName ) )
Modified: maven/components/trunk/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java (original)
+++ maven/components/trunk/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java Mon Jun 20 23:49:49 2005
@@ -132,12 +132,7 @@
public String getId()
{
- String id = constructPluginKey( groupId, artifactId, version );
- if ( groupId == null || artifactId == null || version == null )
- {
- throw new IllegalStateException( "Plugin descriptor ID incomplete: " + id + " in " + getSource() );
- }
- return id;
+ return constructPluginKey( groupId, artifactId, version );
}
/**
Modified: maven/components/trunk/maven-plugins/maven-eclipse-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-eclipse-plugin/pom.xml?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-eclipse-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-eclipse-plugin/pom.xml Mon Jun 20 23:49:49 2005
@@ -16,6 +16,12 @@
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact-test</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>1.0-alpha-3</version>
Modified: maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java (original)
+++ maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java Mon Jun 20 23:49:49 2005
@@ -1,43 +1,37 @@
package org.apache.maven.plugin.eclipse;
/*
- * Copyright (c) 2004, Codehaus.org
+ * Copyright 2001-2005 The Apache Software Foundation.
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
+ * 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
*
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * 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.repository.DefaultArtifactRepository;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.util.StringUtils;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import java.util.Collections;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
@@ -75,7 +69,8 @@
ArtifactRepositoryLayout localRepositoryLayout = (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, "legacy" );
- ArtifactRepository localRepository = new ArtifactRepository("local", "file://" + repo.getAbsolutePath(), localRepositoryLayout);
+ ArtifactRepository localRepository = new DefaultArtifactRepository( "local", "file://" + repo.getAbsolutePath(),
+ localRepositoryLayout );
MavenProject project = builder.build( new File( basedir, "project.xml" ), localRepository, Collections.EMPTY_LIST );
Modified: maven/components/trunk/maven-plugins/maven-ejb-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-ejb-plugin/pom.xml?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-ejb-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-ejb-plugin/pom.xml Mon Jun 20 23:49:49 2005
@@ -13,7 +13,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
- <version>2.0-alpha-2</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Modified: maven/components/trunk/maven-plugins/maven-war-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-war-plugin/pom.xml?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-war-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-war-plugin/pom.xml Mon Jun 20 23:49:49 2005
@@ -13,7 +13,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
- <version>2.0-alpha-2</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Modified: maven/components/trunk/maven-project/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/pom.xml?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-project/pom.xml (original)
+++ maven/components/trunk/maven-project/pom.xml Mon Jun 20 23:49:49 2005
@@ -33,5 +33,11 @@
<artifactId>plexus-utils</artifactId>
<version>1.0-alpha-3</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact-test</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/AlwaysOnProfileActivator.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/AlwaysOnProfileActivator.java?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/AlwaysOnProfileActivator.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/AlwaysOnProfileActivator.java Mon Jun 20 23:49:49 2005
@@ -22,7 +22,6 @@
public class AlwaysOnProfileActivator
implements ProfileActivator
{
-
public boolean canDetermineActivation( Profile profile )
{
return profile.getActivation() != null && profile.getActivation() instanceof AlwaysOnActivation;
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/DetectedProfileActivator.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/DetectedProfileActivator.java?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/DetectedProfileActivator.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/DetectedProfileActivator.java Mon Jun 20 23:49:49 2005
@@ -21,12 +21,11 @@
public abstract class DetectedProfileActivator
implements ProfileActivator
{
-
public boolean canDetermineActivation( Profile profile )
{
return !ProfileActivationUtils.profilesWereExplicitlyGiven() && canDetectActivation( profile );
}
-
+
protected abstract boolean canDetectActivation( Profile profile );
}
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/ExplicitListingProfileActivator.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/ExplicitListingProfileActivator.java?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/ExplicitListingProfileActivator.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/ExplicitListingProfileActivator.java Mon Jun 20 23:49:49 2005
@@ -21,7 +21,6 @@
public class ExplicitListingProfileActivator
implements ProfileActivator
{
-
public boolean canDetermineActivation( Profile profile )
{
return ProfileActivationUtils.profilesWereExplicitlyGiven();
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/JdkPrefixProfileActivator.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/JdkPrefixProfileActivator.java?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/JdkPrefixProfileActivator.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/JdkPrefixProfileActivator.java Mon Jun 20 23:49:49 2005
@@ -23,7 +23,6 @@
public class JdkPrefixProfileActivator
extends DetectedProfileActivator
{
-
private static final String JDK_VERSION = System.getProperty( "java.version" );
public boolean isActive( Profile profile )
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivationCalculator.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivationCalculator.java?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivationCalculator.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivationCalculator.java Mon Jun 20 23:49:49 2005
@@ -36,7 +36,6 @@
extends AbstractLogEnabled
implements Contextualizable
{
-
public static final String ROLE = ProfileActivationCalculator.class.getName();
private PlexusContainer container;
@@ -59,7 +58,8 @@
Activation activation = profile.getActivation();
- activatorLoop: for ( Iterator activatorIterator = activators.iterator(); activatorIterator.hasNext(); )
+ activatorLoop:
+ for ( Iterator activatorIterator = activators.iterator(); activatorIterator.hasNext(); )
{
ProfileActivator activator = (ProfileActivator) activatorIterator.next();
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivationUtils.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivationUtils.java?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivationUtils.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivationUtils.java Mon Jun 20 23:49:49 2005
@@ -24,44 +24,43 @@
public final class ProfileActivationUtils
{
-
public static final String ACTIVE_PROFILE_IDS = "org.apache.maven.ActiveProfiles";
-
+
private static List profileList;
private ProfileActivationUtils()
{
}
-
+
public static boolean profilesWereExplicitlyGiven()
{
return StringUtils.isNotEmpty( System.getProperty( ACTIVE_PROFILE_IDS ) );
}
-
+
public static List getExplicitProfileList()
{
- if(!profilesWereExplicitlyGiven())
+ if ( !profilesWereExplicitlyGiven() )
{
return null;
}
-
- if( profileList == null )
+
+ if ( profileList == null )
{
profileList = new ArrayList();
-
+
StringTokenizer profileTokens = new StringTokenizer( System.getProperty( ACTIVE_PROFILE_IDS ), "," );
-
- while( profileTokens.hasMoreTokens() )
+
+ while ( profileTokens.hasMoreTokens() )
{
String token = profileTokens.nextToken().trim();
-
- if( StringUtils.isNotEmpty( token ) )
+
+ if ( StringUtils.isNotEmpty( token ) )
{
profileList.add( token );
}
}
}
-
+
return profileList;
}
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivator.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivator.java?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivator.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivator.java Mon Jun 20 23:49:49 2005
@@ -20,7 +20,6 @@
public interface ProfileActivator
{
-
static final String ROLE = ProfileActivator.class.getName();
boolean canDetermineActivation( Profile profile );
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/SystemPropertyProfileActivator.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/SystemPropertyProfileActivator.java?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/SystemPropertyProfileActivator.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/SystemPropertyProfileActivator.java Mon Jun 20 23:49:49 2005
@@ -24,7 +24,6 @@
public class SystemPropertyProfileActivator
extends DetectedProfileActivator
{
-
protected boolean canDetectActivation( Profile profile )
{
return profile.getActivation() != null && profile.getActivation().getProperty() != null;
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Mon Jun 20 23:49:49 2005
@@ -24,7 +24,6 @@
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.ArtifactResolver;
-import org.apache.maven.artifact.transform.ReleaseArtifactTransformation;
import org.apache.maven.model.Build;
import org.apache.maven.model.DistributionManagement;
import org.apache.maven.model.Model;
@@ -99,7 +98,7 @@
private ModelInterpolator modelInterpolator;
private ArtifactRepositoryFactory artifactRepositoryFactory;
-
+
private ProfileActivationCalculator profileActivationCalculator;
private final Map modelCache = new HashMap();
@@ -148,7 +147,8 @@
return buildFromSourceFile( projectDescriptor, localRepository, externalProfiles );
}
- private MavenProject buildFromSourceFile( File projectDescriptor, ArtifactRepository localRepository, List externalProfiles )
+ private MavenProject buildFromSourceFile( File projectDescriptor, ArtifactRepository localRepository,
+ List externalProfiles )
throws ProjectBuildingException, ArtifactResolutionException
{
Model model = readModel( projectDescriptor );
@@ -216,24 +216,29 @@
return model;
}
- private MavenProject build( String pomLocation, Model model, ArtifactRepository localRepository, List externalProfiles )
+ private MavenProject build( String pomLocation, Model model, ArtifactRepository localRepository,
+ List externalProfiles )
throws ProjectBuildingException, ArtifactResolutionException
{
Model superModel = getSuperModel();
LinkedList lineage = new LinkedList();
- List aggregatedRemoteWagonRepositories = ProjectUtils.buildArtifactRepositories( superModel.getRepositories(), artifactRepositoryFactory, container );
+ List aggregatedRemoteWagonRepositories = ProjectUtils.buildArtifactRepositories( superModel.getRepositories(),
+ artifactRepositoryFactory,
+ container );
for ( Iterator i = externalProfiles.iterator(); i.hasNext(); )
{
Profile externalProfile = (Profile) i.next();
-
+
for ( Iterator repoIterator = externalProfile.getRepositories().iterator(); repoIterator.hasNext(); )
{
Repository mavenRepo = (Repository) repoIterator.next();
- ArtifactRepository artifactRepo = ProjectUtils.buildArtifactRepository( mavenRepo, artifactRepositoryFactory, container );
+ ArtifactRepository artifactRepo = ProjectUtils.buildArtifactRepository( mavenRepo,
+ artifactRepositoryFactory,
+ container );
if ( !aggregatedRemoteWagonRepositories.contains( artifactRepo ) )
{
@@ -241,7 +246,7 @@
}
}
}
-
+
MavenProject project = assembleLineage( model, lineage, aggregatedRemoteWagonRepositories, localRepository );
// we don't have to force the collision exception for superModel here, it's already been done in getSuperModel()
@@ -264,7 +269,8 @@
}
catch ( ModelInterpolationException e )
{
- throw new ProjectBuildingException( "Error building project from \'" + pomLocation + "\': " + model.getId(), e );
+ throw new ProjectBuildingException( "Error building project from \'" + pomLocation + "\': " + model.getId(),
+ e );
}
return project;
}
@@ -298,7 +304,8 @@
* the resolved source roots, etc for the parent - that occurs for the parent when it is constructed independently
* and projects are not cached or reused
*/
- private MavenProject processProjectLogic( String pomLocation, MavenProject project, List remoteRepositories, List externalProfiles )
+ private MavenProject processProjectLogic( String pomLocation, MavenProject project, List remoteRepositories,
+ List externalProfiles )
throws ProjectBuildingException, ModelInterpolationException
{
Model model = project.getModel();
@@ -308,45 +315,48 @@
{
modelCache.put( key, model );
}
-
+
List activeProfiles = new ArrayList( externalProfiles );
-
+
List activePomProfiles = profileActivationCalculator.calculateActiveProfiles( model.getProfiles() );
-
+
activeProfiles.addAll( activePomProfiles );
-
+
Properties profileProperties = new Properties();
-
+
for ( Iterator it = activeProfiles.iterator(); it.hasNext(); )
{
Profile profile = (Profile) it.next();
-
+
modelInheritanceAssembler.mergeProfileWithModel( model, profile );
-
+
profileProperties.putAll( profile.getProperties() );
}
-
+
// TODO: Clean this up...we're using this to 'jump' the interpolation step for model properties not expressed in XML.
model = modelInterpolator.interpolate( model );
-
+
// interpolation is before injection, because interpolation is off-limits in the injected variables
modelDefaultsInjector.injectDefaults( model );
MavenProject parentProject = project.getParent();
project = new MavenProject( model );
-
+
project.addProfileProperties( profileProperties );
-
+
project.setActiveProfiles( activeProfiles );
- project.setPluginArtifactRepositories( ProjectUtils.buildArtifactRepositories( model.getPluginRepositories(), artifactRepositoryFactory, container ) );
+ project.setPluginArtifactRepositories(
+ ProjectUtils.buildArtifactRepositories( model.getPluginRepositories(), artifactRepositoryFactory,
+ container ) );
DistributionManagement dm = model.getDistributionManagement();
if ( dm != null )
{
- project.setDistributionManagementArtifactRepository( ProjectUtils.buildArtifactRepository( dm.getRepository(), artifactRepositoryFactory, container ) );
+ project.setDistributionManagementArtifactRepository(
+ ProjectUtils.buildArtifactRepository( dm.getRepository(), artifactRepositoryFactory, container ) );
}
project.setParent( parentProject );
@@ -355,9 +365,7 @@
{
Artifact parentArtifact = artifactFactory.createArtifact( parentProject.getGroupId(),
parentProject.getArtifactId(),
- parentProject.getVersion(),
- null,
- "pom", null );
+ parentProject.getVersion(), null, "pom", null );
project.setParentArtifact( parentArtifact );
}
@@ -369,7 +377,9 @@
if ( validationResult.getMessageCount() > 0 )
{
- throw new ProjectBuildingException( "Failed to validate POM for \'" + pomLocation + "\'.\n\n Reason(s):\n" + validationResult.render( " " ) );
+ throw new ProjectBuildingException(
+ "Failed to validate POM for \'" + pomLocation + "\'.\n\n Reason(s):\n" +
+ validationResult.render( " " ) );
}
return project;
@@ -381,7 +391,8 @@
{
if ( !model.getRepositories().isEmpty() )
{
- List respositories = ProjectUtils.buildArtifactRepositories( model.getRepositories(), artifactRepositoryFactory, container );
+ List respositories = ProjectUtils.buildArtifactRepositories( model.getRepositories(),
+ artifactRepositoryFactory, container );
aggregatedRemoteWagonRepositories.addAll( respositories );
}
@@ -447,12 +458,14 @@
catch ( IOException e )
{
throw new ProjectBuildingException(
- "Failed to build model from file '" + file.getAbsolutePath() + "'.\nError: \'" + e.getLocalizedMessage() + "\'", e );
+ "Failed to build model from file '" + file.getAbsolutePath() + "'.\nError: \'" +
+ e.getLocalizedMessage() + "\'", e );
}
catch ( XmlPullParserException e )
{
throw new ProjectBuildingException(
- "Failed to parse model from file '" + file.getAbsolutePath() + "'.\nError: \'" + e.getLocalizedMessage() + "\'", e );
+ "Failed to parse model from file '" + file.getAbsolutePath() + "'.\nError: \'" +
+ e.getLocalizedMessage() + "\'", e );
}
finally
{
@@ -471,11 +484,15 @@
}
catch ( IOException e )
{
- throw new ProjectBuildingException( "Failed build model from URL \'" + url.toExternalForm() + "\'\nError: \'" + e.getLocalizedMessage() + "\'", e );
+ throw new ProjectBuildingException(
+ "Failed build model from URL \'" + url.toExternalForm() + "\'\nError: \'" + e.getLocalizedMessage() +
+ "\'", e );
}
catch ( XmlPullParserException e )
{
- throw new ProjectBuildingException( "Failed to parse model from URL \'" + url.toExternalForm() + "\'\nError: \'" + e.getLocalizedMessage() + "\'", e );
+ throw new ProjectBuildingException(
+ "Failed to parse model from URL \'" + url.toExternalForm() + "\'\nError: \'" + e.getLocalizedMessage() +
+ "\'", e );
}
finally
{
@@ -496,7 +513,8 @@
protected Set createArtifacts( List dependencies )
{
// TODO: merge with MavenMetadataSource properly
- return new MavenMetadataSource( artifactResolver, this, artifactFactory ).createArtifacts( dependencies, null, null );
+ return new MavenMetadataSource( artifactResolver, this, artifactFactory ).createArtifacts( dependencies, null,
+ null );
}
protected Set createPluginArtifacts( List plugins )
@@ -510,15 +528,15 @@
String version;
if ( StringUtils.isEmpty( p.getVersion() ) )
{
- version = ReleaseArtifactTransformation.RELEASE_VERSION;
+ version = "RELEASE";
}
else
{
version = p.getVersion();
}
- Artifact artifact = artifactFactory.createArtifact( p.getGroupId(), p.getArtifactId(), version,
- null, "maven-plugin", null );
+ Artifact artifact = artifactFactory.createArtifact( p.getGroupId(), p.getArtifactId(), version, null,
+ "maven-plugin", null );
if ( artifact != null )
{
pluginArtifacts.add( artifact );
@@ -545,7 +563,8 @@
{
project.setFile( new File( ".", "pom.xml" ) );
- List remoteRepositories = ProjectUtils.buildArtifactRepositories( superModel.getRepositories(), artifactRepositoryFactory, container );
+ List remoteRepositories = ProjectUtils.buildArtifactRepositories( superModel.getRepositories(),
+ artifactRepositoryFactory, container );
project = processProjectLogic( "<Super-POM>", project, remoteRepositories, externalProfiles );
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java Mon Jun 20 23:49:49 2005
@@ -34,12 +34,12 @@
import org.apache.maven.model.Model;
import org.apache.maven.model.Organization;
import org.apache.maven.model.Plugin;
-import org.apache.maven.model.PluginManagement;
-import org.apache.maven.model.Reporting;
-import org.apache.maven.model.Scm;
import org.apache.maven.model.PluginExecution;
+import org.apache.maven.model.PluginManagement;
import org.apache.maven.model.ReportPlugin;
import org.apache.maven.model.ReportSet;
+import org.apache.maven.model.Reporting;
+import org.apache.maven.model.Scm;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.codehaus.plexus.util.xml.Xpp3Dom;
@@ -1036,11 +1036,12 @@
{
this.executionProject = executionProject;
}
-
- public void writeModel( Writer writer ) throws IOException
+
+ public void writeModel( Writer writer )
+ throws IOException
{
MavenXpp3Writer pomWriter = new MavenXpp3Writer();
-
+
pomWriter.write( writer, getModel() );
}
}
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java Mon Jun 20 23:49:49 2005
@@ -44,8 +44,8 @@
/**
* Build the artifact from the local repository, resolving it if necessary.
*
- * @param artifact the artifact description
- * @param localRepository the local repository
+ * @param artifact the artifact description
+ * @param localRepository the local repository
* @param remoteArtifactRepositories the remote repository list
* @return the built project
* @throws ProjectBuildingException
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java Mon Jun 20 23:49:49 2005
@@ -17,12 +17,12 @@
*/
import org.apache.maven.model.Goal;
+import org.apache.maven.model.Model;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginContainer;
import org.apache.maven.model.PluginExecution;
-import org.apache.maven.model.Model;
-import org.apache.maven.project.inheritance.ModelInheritanceAssembler;
import org.apache.maven.project.inheritance.DefaultModelInheritanceAssembler;
+import org.apache.maven.project.inheritance.ModelInheritanceAssembler;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import java.util.ArrayList;
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProjectUtils.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProjectUtils.java?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProjectUtils.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProjectUtils.java Mon Jun 20 23:49:49 2005
@@ -29,14 +29,13 @@
public final class ProjectUtils
{
-
private ProjectUtils()
{
}
public static List buildArtifactRepositories( List repositories,
- ArtifactRepositoryFactory artifactRepositoryFactory,
- PlexusContainer container )
+ ArtifactRepositoryFactory artifactRepositoryFactory,
+ PlexusContainer container )
throws ProjectBuildingException
{
@@ -46,7 +45,8 @@
{
Repository mavenRepo = (Repository) i.next();
- ArtifactRepository artifactRepo = buildArtifactRepository( mavenRepo, artifactRepositoryFactory, container );
+ ArtifactRepository artifactRepo = buildArtifactRepository( mavenRepo, artifactRepositoryFactory,
+ container );
if ( !repos.contains( artifactRepo ) )
{
@@ -57,8 +57,8 @@
}
public static ArtifactRepository buildArtifactRepository( Repository repo,
- ArtifactRepositoryFactory artifactRepositoryFactory,
- PlexusContainer container )
+ ArtifactRepositoryFactory artifactRepositoryFactory,
+ PlexusContainer container )
throws ProjectBuildingException
{
if ( repo != null )
@@ -67,11 +67,12 @@
String url = repo.getUrl();
String snapshotPolicy = repo.getSnapshotPolicy();
String checksumPolicy = repo.getChecksumPolicy();
-
+
// TODO: make this a map inside the factory instead, so no lookup needed
ArtifactRepositoryLayout layout = getRepositoryLayout( repo, container );
-
- return artifactRepositoryFactory.createArtifactRepository( id, url, layout, snapshotPolicy, checksumPolicy );
+
+ return artifactRepositoryFactory.createArtifactRepository( id, url, layout, snapshotPolicy,
+ checksumPolicy );
}
else
{
@@ -91,8 +92,9 @@
}
catch ( ComponentLookupException e )
{
- throw new ProjectBuildingException( "Cannot find layout implementation corresponding to: \'" + layout
- + "\' for remote repository with id: \'" + mavenRepo.getId() + "\'.", e );
+ throw new ProjectBuildingException(
+ "Cannot find layout implementation corresponding to: \'" + layout +
+ "\' for remote repository with id: \'" + mavenRepo.getId() + "\'.", e );
}
return repositoryLayout;
}
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java Mon Jun 20 23:49:49 2005
@@ -19,7 +19,6 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.AbstractArtifactMetadata;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
-import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
@@ -98,11 +97,6 @@
IOUtil.close( reader );
IOUtil.close( writer );
}
- }
-
- public void retrieveFromRemoteRepository( ArtifactRepository remoteRepository, WagonManager wagonManager )
- {
- // not used - TODO: again indicates bad design?
}
public String toString()
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java Mon Jun 20 23:49:49 2005
@@ -229,7 +229,8 @@
if ( StringUtils.isEmpty( inherited ) || Boolean.valueOf( inherited ).booleanValue() )
{
- ReportPlugin childReportPlugin = (ReportPlugin) childReportersByKey.get( parentReportPlugin.getKey() );
+ ReportPlugin childReportPlugin = (ReportPlugin) childReportersByKey.get(
+ parentReportPlugin.getKey() );
ReportPlugin mergedReportPlugin = parentReportPlugin;
@@ -408,7 +409,7 @@
childBuild = new Build();
child.setBuild( childBuild );
}
-
+
// The build has been set but we want to step in here and fill in
// values that have not been set by the child.
@@ -506,8 +507,8 @@
childScm.setConnection( appendPath( parentScm.getConnection(), child.getArtifactId() ) );
}
- if ( StringUtils.isEmpty( childScm.getDeveloperConnection() )
- && !StringUtils.isEmpty( parentScm.getDeveloperConnection() ) )
+ if ( StringUtils.isEmpty( childScm.getDeveloperConnection() ) &&
+ !StringUtils.isEmpty( parentScm.getDeveloperConnection() ) )
{
childScm
.setDeveloperConnection( appendPath( parentScm.getDeveloperConnection(), child.getArtifactId() ) );
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java Mon Jun 20 23:49:49 2005
@@ -28,6 +28,6 @@
String ROLE = ModelInheritanceAssembler.class.getName();
void assembleModelInheritance( Model child, Model parent );
-
+
void mergeProfileWithModel( Model model, Profile profile );
}
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/injection/DefaultModelDefaultsInjector.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/injection/DefaultModelDefaultsInjector.java?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/injection/DefaultModelDefaultsInjector.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/injection/DefaultModelDefaultsInjector.java Mon Jun 20 23:49:49 2005
@@ -33,7 +33,6 @@
public class DefaultModelDefaultsInjector
implements ModelDefaultsInjector
{
-
public void injectDefaults( Model model )
{
injectDependencyDefaults( model.getDependencies(), model.getDependencyManagement() );
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/injection/ModelDefaultsInjector.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/injection/ModelDefaultsInjector.java?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/injection/ModelDefaultsInjector.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/injection/ModelDefaultsInjector.java Mon Jun 20 23:49:49 2005
@@ -28,5 +28,5 @@
void injectDefaults( Model model );
- void mergePluginWithDefaults( Plugin plugin, Plugin def );
+ void mergePluginWithDefaults( Plugin plugin, Plugin def );
}
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java Mon Jun 20 23:49:49 2005
@@ -24,7 +24,6 @@
public class ModelInterpolationException
extends Exception
{
-
/**
* Added: Feb 2, 2005 by jdcasey
*/
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java Mon Jun 20 23:49:49 2005
@@ -25,7 +25,6 @@
*/
public interface ModelInterpolator
{
-
String ROLE = ModelInterpolator.class.getName();
Model interpolate( Model project )
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java Mon Jun 20 23:49:49 2005
@@ -34,7 +34,7 @@
public ModelValidationResult validate( Model model )
{
ModelValidationResult result = new ModelValidationResult();
-
+
validateStringNotEmpty( "modelVersion", result, model.getModelVersion() );
validateStringNotEmpty( "groupId", result, model.getGroupId() );
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java Mon Jun 20 23:49:49 2005
@@ -46,7 +46,7 @@
{
return messages.get( i ).toString();
}
-
+
public List getMessages()
{
return Collections.unmodifiableList( messages );
@@ -61,7 +61,7 @@
{
return render( "" );
}
-
+
public String render( String indentation )
{
if ( messages.size() == 0 )
Modified: maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml Mon Jun 20 23:49:49 2005
@@ -1,6 +1,6 @@
<component-set>
<components>
- <!--
+<!--
|
|
|
@@ -9,7 +9,7 @@
<role>org.apache.maven.project.interpolation.ModelInterpolator</role>
<implementation>org.apache.maven.project.interpolation.RegexBasedModelInterpolator</implementation>
</component>
- <!--
+<!--
|
|
|
@@ -18,7 +18,7 @@
<role>org.apache.maven.project.injection.ModelDefaultsInjector</role>
<implementation>org.apache.maven.project.injection.DefaultModelDefaultsInjector</implementation>
</component>
- <!--
+<!--
|
|
|
@@ -56,7 +56,7 @@
</requirement>
</requirements>
</component>
- <!--
+<!--
|
|
|
@@ -65,7 +65,7 @@
<role>org.apache.maven.profiles.activation.ProfileActivationCalculator</role>
<implementation>org.apache.maven.profiles.activation.ProfileActivationCalculator</implementation>
</component>
- <!--
+<!--
|
|
|
@@ -75,7 +75,7 @@
<role-hint>always-on</role-hint>
<implementation>org.apache.maven.profiles.activation.AlwaysOnProfileActivator</implementation>
</component>
- <!--
+<!--
|
|
|
@@ -85,7 +85,7 @@
<role-hint>jdk-prefix</role-hint>
<implementation>org.apache.maven.profiles.activation.JdkPrefixProfileActivator</implementation>
</component>
- <!--
+<!--
|
|
|
@@ -95,7 +95,7 @@
<role-hint>system-property</role-hint>
<implementation>org.apache.maven.profiles.activation.SystemPropertyProfileActivator</implementation>
</component>
- <!--
+<!--
|
|
|
@@ -105,7 +105,7 @@
<role-hint>explicit-listing</role-hint>
<implementation>org.apache.maven.profiles.activation.ExplicitListingProfileActivator</implementation>
</component>
- <!--
+<!--
|
|
|
@@ -114,7 +114,7 @@
<role>org.apache.maven.project.inheritance.ModelInheritanceAssembler</role>
<implementation>org.apache.maven.project.inheritance.DefaultModelInheritanceAssembler</implementation>
</component>
- <!--
+<!--
|
|
|
@@ -124,7 +124,7 @@
<implementation>org.apache.maven.project.validation.DefaultModelValidator</implementation>
</component>
- <!-- ********************* FIXME *******************************************
+<!-- ********************* FIXME *******************************************
| I realize this is duplicated but allows the project builder to work by itself
-->
<component>
Modified: maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml (original)
+++ maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml Mon Jun 20 23:49:49 2005
@@ -41,4 +41,4 @@
</testResources>
</build>
</project>
-<!-- END SNIPPET: superpom -->
+ <!-- END SNIPPET: superpom -->
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTestCase.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTestCase.java?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTestCase.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTestCase.java Mon Jun 20 23:49:49 2005
@@ -16,9 +16,10 @@
* limitations under the License.
*/
+import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.DefaultArtifactRepository;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.apache.maven.artifact.factory.ArtifactFactory;
import org.codehaus.plexus.PlexusTestCase;
import java.io.File;
@@ -43,7 +44,7 @@
super.setUp();
projectBuilder = (MavenProjectBuilder) lookup( MavenProjectBuilder.ROLE );
- artifactFactory = ( ArtifactFactory ) lookup( ArtifactFactory.ROLE );
+ artifactFactory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
}
// ----------------------------------------------------------------------
@@ -84,8 +85,9 @@
ArtifactRepositoryLayout repoLayout = (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE,
"legacy" );
- ArtifactRepository r = new ArtifactRepository( "local", "file://" + getLocalRepositoryPath().getAbsolutePath(),
- repoLayout );
+ ArtifactRepository r = new DefaultArtifactRepository( "local",
+ "file://" + getLocalRepositoryPath().getAbsolutePath(),
+ repoLayout );
return r;
}
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ModelUtilsTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ModelUtilsTest.java?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ModelUtilsTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ModelUtilsTest.java Mon Jun 20 23:49:49 2005
@@ -1,10 +1,9 @@
package org.apache.maven.project;
+import junit.framework.TestCase;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginExecution;
-import junit.framework.TestCase;
-
/*
* Copyright 2001-2005 The Apache Software Foundation.
*
@@ -24,7 +23,6 @@
public class ModelUtilsTest
extends TestCase
{
-
public void testShouldInheritOnePluginWithExecution()
{
Plugin parent = new Plugin();
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java Mon Jun 20 23:49:49 2005
@@ -24,7 +24,6 @@
public class ProjectBaseDirectoryAlignmentTest
extends MavenProjectTestCase
{
-
private String dir = "src/test/resources/projects/base-directory-alignment/";
public void testProjectDirectoryBaseDirectoryAlignment()
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java Mon Jun 20 23:49:49 2005
@@ -18,7 +18,6 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.factory.DefaultArtifactFactory;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -112,7 +111,8 @@
ArtifactMetadataSource source, ArtifactFilter filter )
throws ArtifactResolutionException
{
- return super.resolveTransitively( artifacts, remoteRepositories, localRepository, new Source( artifactFactory ), filter );
+ return super.resolveTransitively( artifacts, remoteRepositories, localRepository, new Source( artifactFactory ),
+ filter );
}
public ArtifactResolutionResult resolveTransitively( Set artifacts, List remoteRepositories,
@@ -120,7 +120,8 @@
ArtifactMetadataSource source )
throws ArtifactResolutionException
{
- return super.resolveTransitively( artifacts, remoteRepositories, localRepository, new Source( artifactFactory ) );
+ return super.resolveTransitively( artifacts, remoteRepositories, localRepository,
+ new Source( artifactFactory ) );
}
public ArtifactResolutionResult resolveTransitively( Artifact artifact, List remoteRepositories,
@@ -128,6 +129,7 @@
ArtifactMetadataSource source )
throws ArtifactResolutionException
{
- return super.resolveTransitively( artifact, remoteRepositories, localRepository, new Source( artifactFactory ) );
+ return super.resolveTransitively( artifact, remoteRepositories, localRepository,
+ new Source( artifactFactory ) );
}
}
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java Mon Jun 20 23:49:49 2005
@@ -28,7 +28,6 @@
public class ProjectClasspathTest
extends MavenProjectTestCase
{
-
private String dir = "projects/scope/";
public void testProjectClasspath()
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java Mon Jun 20 23:49:49 2005
@@ -82,7 +82,8 @@
assembler.assembleModelInheritance( child, parent );
- assertEquals( "source directory should be from parent", "src/main/java", child.getBuild().getSourceDirectory() );
+ assertEquals( "source directory should be from parent", "src/main/java",
+ child.getBuild().getSourceDirectory() );
assertEquals( "unit test source directory should be from parent", "src/test/java",
child.getBuild().getTestSourceDirectory() );
@@ -322,45 +323,45 @@
Model parent = makeBaseModel( "parent" );
Model child = makeBaseModel( "child" );
-
+
Plugin parentPlugin = new Plugin();
- parentPlugin.setArtifactId("maven-testInheritance3-plugin");
- parentPlugin.setGroupId("org.apache.maven.plugins");
- parentPlugin.setVersion("1.0");
- parentPlugin.setInherited("false");
-
- List parentPlugins = Collections.singletonList(parentPlugin);
-
+ parentPlugin.setArtifactId( "maven-testInheritance3-plugin" );
+ parentPlugin.setGroupId( "org.apache.maven.plugins" );
+ parentPlugin.setVersion( "1.0" );
+ parentPlugin.setInherited( "false" );
+
+ List parentPlugins = Collections.singletonList( parentPlugin );
+
Build parentBuild = new Build();
- parentBuild.setPlugins(parentPlugins);
-
- parent.setBuild(parentBuild);
+ parentBuild.setPlugins( parentPlugins );
+
+ parent.setBuild( parentBuild );
assembler.assembleModelInheritance( child, parent );
-
+
assertPlugins( new ArrayList(), child );
}
private void assertPlugins( List expectedPlugins, Model child )
{
Build childBuild = child.getBuild();
-
- if( expectedPlugins != null && !expectedPlugins.isEmpty() )
+
+ if ( expectedPlugins != null && !expectedPlugins.isEmpty() )
{
assertNotNull( childBuild );
-
+
Map childPluginsMap = childBuild.getPluginsAsMap();
-
- if( childPluginsMap != null )
+
+ if ( childPluginsMap != null )
{
assertEquals( expectedPlugins.size(), childPluginsMap.size() );
-
+
for ( Iterator it = expectedPlugins.iterator(); it.hasNext(); )
{
Plugin expectedPlugin = (Plugin) it.next();
-
+
Plugin childPlugin = (Plugin) childPluginsMap.get( expectedPlugin.getKey() );
-
+
assertPluginsEqual( expectedPlugin, childPlugin );
}
}
@@ -377,25 +378,26 @@
private void assertPluginsEqual( Plugin reference, Plugin test )
{
- assertEquals("Plugin keys don't match", reference.getKey(), test.getKey());
- assertEquals("Plugin configurations don't match", reference.getConfiguration(), test.getConfiguration());
-
+ assertEquals( "Plugin keys don't match", reference.getKey(), test.getKey() );
+ assertEquals( "Plugin configurations don't match", reference.getConfiguration(), test.getConfiguration() );
+
List referenceGoals = reference.getGoals();
Map testGoalsMap = test.getGoalsAsMap();
-
- if( referenceGoals != null && !referenceGoals.isEmpty() )
+
+ if ( referenceGoals != null && !referenceGoals.isEmpty() )
{
assertTrue( "Missing goals specification", ( testGoalsMap != null && !testGoalsMap.isEmpty() ) );
-
+
for ( Iterator it = referenceGoals.iterator(); it.hasNext(); )
{
Goal referenceGoal = (Goal) it.next();
Goal testGoal = (Goal) testGoalsMap.get( referenceGoal.getId() );
-
+
assertNotNull( "Goal from reference not found in test", testGoal );
-
+
assertEquals( "Goal IDs don't match", referenceGoal.getId(), testGoal.getId() );
- assertEquals( "Goal configurations don't match", referenceGoal.getConfiguration(), testGoal.getConfiguration() );
+ assertEquals( "Goal configurations don't match", referenceGoal.getConfiguration(),
+ testGoal.getConfiguration() );
}
}
else
@@ -500,7 +502,8 @@
if ( actualRepository.getId().equals( expectedRepository.getId() ) )
{
- assertEquals( "Repository URLs don't match", expectedRepository.getUrl(), actualRepository.getUrl() );
+ assertEquals( "Repository URLs don't match", expectedRepository.getUrl(),
+ actualRepository.getUrl() );
found = true;
}
}
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/injection/DefaultModelDefaultsInjectorTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/injection/DefaultModelDefaultsInjectorTest.java?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/injection/DefaultModelDefaultsInjectorTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/injection/DefaultModelDefaultsInjectorTest.java Mon Jun 20 23:49:49 2005
@@ -29,7 +29,6 @@
public class DefaultModelDefaultsInjectorTest
extends TestCase
{
-
public void testShouldConstructWithNoParams()
{
new DefaultModelDefaultsInjector();
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java Mon Jun 20 23:49:49 2005
@@ -34,8 +34,9 @@
private Model model;
private ModelValidator validator;
-
- public void testMissingModelVersion() throws Exception
+
+ public void testMissingModelVersion()
+ throws Exception
{
ModelValidationResult result = validate( "missing-modelVersion-pom.xml" );
@@ -92,11 +93,11 @@
assertEquals( 4, result.getMessageCount() );
List messages = result.getMessages();
-
- assertTrue( messages.contains("\'modelVersion\' is missing."));
- assertTrue( messages.contains("\'groupId\' is missing."));
- assertTrue( messages.contains("\'artifactId\' is missing."));
- assertTrue( messages.contains("\'version\' is missing."));
+
+ assertTrue( messages.contains( "\'modelVersion\' is missing." ) );
+ assertTrue( messages.contains( "\'groupId\' is missing." ) );
+ assertTrue( messages.contains( "\'artifactId\' is missing." ) );
+ assertTrue( messages.contains( "\'version\' is missing." ) );
// type is inherited from the super pom
}
Modified: maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml (original)
+++ maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml Mon Jun 20 23:49:49 2005
@@ -1,6 +1,6 @@
<plexus>
<components>
- <!-- Due to PLX-108, have to work around it...
+<!-- Due to PLX-108, have to work around it...
<component>
<role>org.apache.maven.artifact.ArtifactResolver</role>
<implementation>org.apache.maven.project.ProjectClasspathArtifactResolver</implementation>
@@ -23,6 +23,9 @@
</requirement>
<requirement>
<role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.artifact.resolver.ArtifactCollector</role>
</requirement>
</requirements>
</component>
Modified: maven/components/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/pom.xml?rev=191634&r1=191633&r2=191634&view=diff
==============================================================================
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Mon Jun 20 23:49:49 2005
@@ -105,6 +105,7 @@
<module>maven-archetype</module>
<module>maven-archiver</module>
<module>maven-artifact</module>
+ <module>maven-artifact-manager</module>
<module>maven-artifact-ant</module>
<module>maven-artifact-test</module>
<module>maven-core</module>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org