svn commit: r587908 - /maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java
Author: joakime
Date: Wed Oct 24 08:38:38 2007
New Revision: 587908
URL: http://svn.apache.org/viewvc?rev=587908view=rev
Log:
[MRM-564] Audit log is not populated when artifacts are deployed
Passing through listener to actual davserver impl.
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java?rev=587908r1=587907r2=587908view=diff
==
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java
(original)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java
Wed Oct 24 08:38:38 2007
@@ -40,6 +40,7 @@
import org.codehaus.plexus.webdav.AbstractDavServerComponent;
import org.codehaus.plexus.webdav.DavServerComponent;
import org.codehaus.plexus.webdav.DavServerException;
+import org.codehaus.plexus.webdav.DavServerListener;
import org.codehaus.plexus.webdav.servlet.DavServerRequest;
import org.codehaus.plexus.webdav.util.WebdavMethodUtil;
@@ -438,12 +439,37 @@
}
@Override
+public void addListener( DavServerListener listener )
+{
+super.addListener( listener );
+davServer.addListener( listener );
+}
+
+@Override
+public boolean isUseIndexHtml()
+{
+return davServer.isUseIndexHtml();
+}
+
+@Override
+public boolean hasResource( String resource )
+{
+return davServer.hasResource( resource );
+}
+
+@Override
+public void removeListener( DavServerListener listener )
+{
+davServer.removeListener( listener );
+}
+
+@Override
public void setUseIndexHtml( boolean useIndexHtml )
{
super.setUseIndexHtml( useIndexHtml );
davServer.setUseIndexHtml( useIndexHtml );
}
-
+
public ManagedRepositoryContent getRepository()
{
return managedRepository;
svn commit: r587923 - /maven/archiva/trunk/pom.xml
Author: joakime Date: Wed Oct 24 09:38:27 2007 New Revision: 587923 URL: http://svn.apache.org/viewvc?rev=587923view=rev Log: Updating version Modified: maven/archiva/trunk/pom.xml Modified: maven/archiva/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/archiva/trunk/pom.xml?rev=587923r1=587922r2=587923view=diff == --- maven/archiva/trunk/pom.xml (original) +++ maven/archiva/trunk/pom.xml Wed Oct 24 09:38:27 2007 @@ -630,7 +630,7 @@ dependency groupIdorg.codehaus.plexus.webdav/groupId artifactIdplexus-webdav-simple/artifactId -version1.0-alpha-4/version +version1.0-beta-1-SNAPSHOT/version /dependency dependency groupIdjavax.servlet/groupId
svn commit: r587800 - /maven/components/trunk/maven-embedder/pom.xml
Author: jvanzyl
Date: Tue Oct 23 23:58:27 2007
New Revision: 587800
URL: http://svn.apache.org/viewvc?rev=587800view=rev
Log:
o put the tycho profile back
Modified:
maven/components/trunk/maven-embedder/pom.xml
Modified: maven/components/trunk/maven-embedder/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/pom.xml?rev=587800r1=587799r2=587800view=diff
==
--- maven/components/trunk/maven-embedder/pom.xml (original)
+++ maven/components/trunk/maven-embedder/pom.xml Tue Oct 23 23:58:27 2007
@@ -1,5 +1,4 @@
?xml version=1.0 encoding=UTF-8?
-
!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,9 +17,7 @@
specific language governing permissions and limitations
under the License.
--
-
-project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
+project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
parent
artifactIdmaven/artifactId
groupIdorg.apache.maven/groupId
@@ -39,7 +36,7 @@
groupIdorg.codehaus.plexus/groupId
artifactIdplexus-container-default/artifactId
/dependency
-!-- CLI --
+!-- CLI --
dependency
groupIdcommons-cli/groupId
artifactIdcommons-cli/artifactId
@@ -137,6 +134,67 @@
/build
/profile
profile
+ !--
+ |
+ | This profile is specifically for creating an embedder that can be
used for Eclipse integration. We need to
+ | need a single embedder JAR that looks like an OSGi bundle.
+ |
+ --
+ idtycho/id
+ properties
+bundleVersion2.1.0.v20070901-1427/bundleVersion
+ /properties
+ build
+resources
+ resource
+directorysrc/main/resources/directory
+filteringtrue/filtering
+ /resource
+/resources
+plugins
+ plugin
+artifactIdshade-maven-plugin/artifactId
+groupIdorg.codehaus.mojo/groupId
+version1.0-alpha-12/version
+executions
+ execution
+phasepackage/phase
+goals
+ goalshade/goal
+/goals
+configuration
+ finalNamemaven-embedder-tycho-${bundleVersion}/finalName
+
createDependencyReducedPomfalse/createDependencyReducedPom
+
keepDependenciesWithProvidedScopetrue/keepDependenciesWithProvidedScope
+ transformers
+transformer
implementation=org.codehaus.mojo.shade.resource.ComponentsXmlResourceTransformer/
+ /transformers
+ artifactSet
+excludes
+
excludeorg.codehaus.plexus:plexus-component-api/exclude
+ excludeclassworlds:classworlds/exclude
+ excludejunit:junit/exclude
+ excludejmock:jmock/exclude
+ excludexml-apis:xml-apis/exclude
+/excludes
+ /artifactSet
+ relocations
+relocation
+ patternorg.codehaus.plexus.util/pattern
+ excludes
+excludeorg.codehaus.plexus.util.xml.Xpp3Dom/exclude
+excludeorg.codehaus.plexus.util.xml.pull.*/exclude
+ /excludes
+/relocation
+ /relocations
+/configuration
+ /execution
+/executions
+ /plugin
+/plugins
+ /build
+/profile
+profile
idstandard/id
activation
activeByDefaulttrue/activeByDefault
@@ -160,14 +218,14 @@
/execution
/executions
/plugin
- plugin
- artifactIdmaven-surefire-plugin/artifactId
- version2.3/version
- configuration
- forkModeonce/forkMode
- /configuration
- /plugin
- /plugins
+ plugin
+artifactIdmaven-surefire-plugin/artifactId
+version2.3/version
+configuration
+ forkModeonce/forkMode
+/configuration
+ /plugin
+/plugins
/build
/profile
profile
@@ -187,21 +245,4 @@
/build
/profile
/profiles
-
- !--
- build
-pluginManagement
- plugins
-plugin
- artifactIdmaven-surefire-plugin/artifactId
- configuration
-excludes
-
svn commit: r587811 - in /maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265: pom.xml src/site/apt/ src/site/apt/download.apt.vm src/site/site.xml verify.bsh
Author: olamy
Date: Wed Oct 24 01:11:50 2007
New Revision: 587811
URL: http://svn.apache.org/viewvc?rev=587811view=rev
Log:
update the it to test : using apt files as download.apt.vm
Added:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/apt/
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/apt/download.apt.vm
(with props)
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/site.xml
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/verify.bsh
Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml?rev=587811r1=587810r2=587811view=diff
==
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml Wed Oct 24
01:11:50 2007
@@ -26,4 +26,7 @@
packagingpom/packaging
version1.0-SNAPSHOT/version
nameMSITE-265 It/name
+ properties
+currentVersion2.0.7/currentVersion
+ /properties
/project
Added:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/apt/download.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/apt/download.apt.vm?rev=587811view=auto
==
---
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/apt/download.apt.vm
(added)
+++
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/apt/download.apt.vm
Wed Oct 24 01:11:50 2007
@@ -0,0 +1,11 @@
+ --
+Download Maven ${currentVersion}
+ --
+Brett Porter
+Jason van Zyl
+ --
+4 October 2005
+ --
+
+Download Maven ${currentVersion}
+
Propchange:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/apt/download.apt.vm
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/apt/download.apt.vm
--
svn:executable = *
Propchange:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/apt/download.apt.vm
--
svn:keywords = Author Date Id Revision
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/site.xml?rev=587811r1=587810r2=587811view=diff
==
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/site.xml
(original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/site.xml
Wed Oct 24 01:11:50 2007
@@ -8,6 +8,9 @@
artifactIdmaven-stylus-skin/artifactId
/skin
body
+breadcrumbs
+ item name=Maven href=http://maven.apache.org/${currentVersion}/
+/breadcrumbs
menu name=Releases TODO
item name=release1.6 href=releases/release1.6.html/
item name=release1.6.3 href=releases/release1.6.3.html/
Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/verify.bsh?rev=587811r1=587810r2=587811view=diff
==
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/verify.bsh (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/verify.bsh Wed Oct
24 01:11:50 2007
@@ -19,6 +19,7 @@
*/
import java.io.*;
+import org.codehaus.plexus.util.*;
boolean result = true;
@@ -55,7 +56,22 @@
{
System.err.println( release16 file is missing or a directory. );
return false;
-}
+}
+
+File download = new File ( siteDirectory, download.html );
+if ( !download.exists() || download.isDirectory() )
+{
+System.err.println( download.html file is missing or a directory. );
+return false;
+}
+FileInputStream fis = new FileInputStream ( download );
+String downloadContent = IOUtil.toString ( fis );
+int indexOf = downloadContent.indexOf( Download Maven 2.0.7 );
+if ( indexOf 0)
+{
+ System.err.println( download.html doesn't contains Download Maven
2.0.7 );
+}
+
}
catch( IOException e )
{
svn commit: r587930 - /maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSource.java
Author: jvanzyl
Date: Wed Oct 24 10:10:16 2007
New Revision: 587930
URL: http://svn.apache.org/viewvc?rev=587930view=rev
Log:
o catch an incorrect repository property for the remote catalog
Modified:
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSource.java
Modified:
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSource.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSource.java?rev=587930r1=587929r2=587930view=diff
==
---
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSource.java
(original)
+++
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSource.java
Wed Oct 24 10:10:16 2007
@@ -51,10 +51,15 @@
public List getArchetypes( Properties properties )
throws ArchetypeDataSourceException
{
+String repository = properties.getProperty( REPOSITORY_PROPERTY );
+
+if ( repository == null )
+{
+throw new ArchetypeDataSourceException( To use the remote catalog
you must specify the 'remote-catalog.repository' property correctly in your
~/.m2/archetype-catalog.properties file. );
+}
+
try
{
-String repository = properties.getProperty( REPOSITORY_PROPERTY );
-
if ( repository.endsWith( / ) )
{
repository = repository.substring( 0, repository.length( ) -
1 );
@@ -203,4 +208,4 @@
return d;
}
-}
\ No newline at end of file
+}
svn commit: r587991 - in /maven/artifact/trunk/src: main/java/org/apache/maven/artifact/metadata/ test/java/org/apache/maven/artifact/resolver/
Author: carlos
Date: Wed Oct 24 13:02:42 2007
New Revision: 587991
URL: http://svn.apache.org/viewvc?rev=587991view=rev
Log:
Add an artifact field to ArtifactMetadataRetrievalException to store the
artifact causing the problem
Modified:
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataRetrievalException.java
maven/artifact/trunk/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
maven/artifact/trunk/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java
Modified:
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataRetrievalException.java
URL:
http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataRetrievalException.java?rev=587991r1=587990r2=587991view=diff
==
---
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataRetrievalException.java
(original)
+++
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataRetrievalException.java
Wed Oct 24 13:02:42 2007
@@ -19,6 +19,8 @@
* under the License.
*/
+import org.apache.maven.artifact.Artifact;
+
/**
* Error while retrieving repository metadata from the repository.
*
@@ -28,18 +30,41 @@
public class ArtifactMetadataRetrievalException
extends Exception
{
+
+private Artifact artifact;
+
+/**
+ * @deprecated use [EMAIL PROTECTED]
#ArtifactMetadataRetrievalException(String, Throwable, Artifact)}
+ */
public ArtifactMetadataRetrievalException( String message )
{
-super( message );
+this( message, null, null );
}
+/**
+ * @deprecated use [EMAIL PROTECTED]
#ArtifactMetadataRetrievalException(String, Throwable, Artifact)}
+ */
public ArtifactMetadataRetrievalException( Throwable cause )
{
-super( cause );
+this( null, cause, null );
}
+/**
+ * @deprecated use [EMAIL PROTECTED]
#ArtifactMetadataRetrievalException(String, Throwable, Artifact)}
+ */
public ArtifactMetadataRetrievalException( String message, Throwable cause
)
{
+this( message, cause, null );
+}
+
+public ArtifactMetadataRetrievalException( String message, Throwable
cause, Artifact artifact )
+{
super( message, cause );
+this.artifact = artifact;
+}
+
+public Artifact getArtifact()
+{
+return artifact;
}
}
Modified:
maven/artifact/trunk/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
URL:
http://svn.apache.org/viewvc/maven/artifact/trunk/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java?rev=587991r1=587990r2=587991view=diff
==
---
maven/artifact/trunk/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
(original)
+++
maven/artifact/trunk/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
Wed Oct 24 13:02:42 2007
@@ -109,13 +109,15 @@
if ( g.equals( artifact.getArtifactId() ) )
{
+Artifact a = null;
try
{
-dependencies.add( createArtifact( org.apache.maven,
h, 1.0, jar ) );
+a = createArtifact( org.apache.maven, h, 1.0,
jar );
+dependencies.add( a );
}
catch ( Exception e )
{
-throw new ArtifactMetadataRetrievalException( e );
+throw new ArtifactMetadataRetrievalException( Error
retrieving metadata, e, a );
}
}
@@ -163,13 +165,15 @@
if ( i.equals( artifact.getArtifactId() ) )
{
+Artifact a = null;
try
{
-dependencies.add( createArtifact( org.apache.maven,
j, 1.0, jar ) );
+a = createArtifact( org.apache.maven, j, 1.0,
jar );
+dependencies.add( a );
}
catch ( Exception e )
{
-throw new ArtifactMetadataRetrievalException( e );
+throw new ArtifactMetadataRetrievalException( Error
retrieving metadata, e, a );
}
}
Modified:
maven/artifact/trunk/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java
URL:
http://svn.apache.org/viewvc/maven/artifact/trunk/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java?rev=587991r1=587990r2=587991view=diff
svn commit: r587996 - /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Author: carlos
Date: Wed Oct 24 13:06:08 2007
New Revision: 587996
URL: http://svn.apache.org/viewvc?rev=587996view=rev
Log:
Add an artifact field to ArtifactMetadataRetrievalException to store the
artifact causing the problem
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=587996r1=587995r2=587996view=diff
==
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Wed Oct 24 13:06:08 2007
@@ -158,7 +158,7 @@
catch ( ProjectBuildingException e )
{
throw new ArtifactMetadataRetrievalException( Unable
to read the metadata file for artifact ' +
-artifact.getDependencyConflictId() + ': +
e.getMessage(), e );
+artifact.getDependencyConflictId() + ': +
e.getMessage(), e, artifact );
}
}
svn commit: r587998 - in /maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder: MavenEmbedder.java execution/DefaultMavenExecutionRequestPopulator.java
Author: carlos
Date: Wed Oct 24 13:07:08 2007
New Revision: 587998
URL: http://svn.apache.org/viewvc?rev=587998view=rev
Log:
Store the pom File object in the execution request instead of its path
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=587998r1=587997r2=587998view=diff
==
---
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
(original)
+++
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
Wed Oct 24 13:07:08 2007
@@ -467,7 +467,7 @@
// If the artifact handlers are not loaded up-front then this
dependency element is not
// registered as an artifact and is not added to the classpath
elements.
-MavenProject project = readProject( new File( request.getPomFile()
) );
+MavenProject project = readProject( request.getPom() );
Map handlers = findArtifactTypeHandlers( project );
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java?rev=587998r1=587997r2=587998view=diff
==
---
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
(original)
+++
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
Wed Oct 24 13:07:08 2007
@@ -199,9 +199,9 @@
// look for the standard POM.
//
-if ( request.getPomFile() != null )
+if ( request.getPom() != null )
{
-request.setBaseDirectory( new File( request.getPomFile() ) );
+request.setBaseDirectory( request.getPom() );
}
else if ( request.getBaseDirectory() != null )
{
@@ -213,7 +213,7 @@
pom = new File( request.getBaseDirectory(), Maven.POMv4 );
}
-request.setPomFile( pom.getAbsolutePath() );
+request.setPom( pom );
}
}
svn commit: r587999 - in /maven/components/trunk/maven-core/src/main/java/org/apache/maven: DefaultMaven.java execution/DefaultMavenExecutionRequest.java execution/ExecutionBuildContext.java execution
Author: carlos
Date: Wed Oct 24 13:07:15 2007
New Revision: 587999
URL: http://svn.apache.org/viewvc?rev=587999view=rev
Log:
Store the pom File object in the execution request instead of its path
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/ExecutionBuildContext.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=587999r1=587998r2=587999view=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
Wed Oct 24 13:07:15 2007
@@ -468,9 +468,9 @@
// make sure there is consistent ordering on all platforms, rather
than using the filesystem ordering
Collections.sort( files );
}
-else if ( request.getPomFile() != null )
+else if ( request.getPom() != null )
{
-File projectFile = new File( request.getPomFile()
).getAbsoluteFile();
+File projectFile = request.getPom().getAbsoluteFile();
if ( projectFile.exists() )
{
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java?rev=587999r1=587998r2=587999view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
Wed Oct 24 13:07:15 2007
@@ -82,7 +82,7 @@
private boolean recursive = true;
-private String pomFile;
+private File pom;
private String reactorFailureBehavior = REACTOR_FAIL_FAST;
@@ -146,9 +146,15 @@
return properties;
}
+/** @deprecated use [EMAIL PROTECTED] #getPom()} */
public String getPomFile()
{
-return pomFile;
+return pom.getAbsolutePath();
+}
+
+public File getPom()
+{
+return pom;
}
public String getReactorFailureBehavior()
@@ -367,9 +373,17 @@
return useReactor;
}
+/** @deprecated use [EMAIL PROTECTED] #setPom(File)} */
public MavenExecutionRequest setPomFile( String pomFilename )
{
-this.pomFile = pomFilename;
+this.pom = new File( pomFilename );
+
+return this;
+}
+
+public MavenExecutionRequest setPom( File pom )
+{
+this.pom = pom;
return this;
}
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/ExecutionBuildContext.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/ExecutionBuildContext.java?rev=587999r1=587998r2=587999view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/ExecutionBuildContext.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/ExecutionBuildContext.java
Wed Oct 24 13:07:15 2007
@@ -108,7 +108,7 @@
public String getPomFile()
{
-return request.getPomFile();
+return request.getPom().getAbsolutePath();
}
public List getProfiles()
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java?rev=587999r1=587998r2=587999view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
Wed Oct 24 13:07:15 2007
@@ -109,8 +109,13 @@
List getEventMonitors();
// Pom
+/** @deprecated use [EMAIL PROTECTED] #setPom(File)} */
MavenExecutionRequest setPomFile( String pomFilename );
+/** @deprecated use [EMAIL PROTECTED] #getPom()} */
String getPomFile();
+
+MavenExecutionRequest
svn commit: r588011 - /maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
Author: carlos
Date: Wed Oct 24 13:48:34 2007
New Revision: 588011
URL: http://svn.apache.org/viewvc?rev=588011view=rev
Log:
Strong type add*Exception methods, fix error in addCircularDependencyException,
still one problem to fix in addVersionRangeViolation
Modified:
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
Modified:
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
URL:
http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java?rev=588011r1=588010r2=588011view=diff
==
---
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
(original)
+++
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
Wed Oct 24 13:48:34 2007
@@ -37,7 +37,10 @@
* - missing artifacts
* - network/transfer errors
* - file system errors: permissions
- *
+ *
+ * @TODO carlos: all these possible has*Exceptions and get*Exceptions methods
make the clients too
+ * complex requiring a long list of checks, need to create a
parent/interfact/encapsulation
+ * for the types of exceptions
* @author Jason van Zyl
* @version $Id$
*/
@@ -116,10 +119,7 @@
public ArtifactResolutionResult addMissingArtifact( Artifact artifact )
{
-if ( missingArtifacts == null )
-{
-missingArtifacts = new ArrayList();
-}
+initList( missingArtifacts );
missingArtifacts.add( artifact );
@@ -142,12 +142,14 @@
return versionRangeViolations != null;
}
+/**
+ * @TODO this needs to accept a [EMAIL PROTECTED]
OverConstrainedVersionException} as returned by
+ * [EMAIL PROTECTED] #getVersionRangeViolation(int)} but it's not
used like that in
+ * [EMAIL PROTECTED] DefaultArtifactCollector}
+ */
public ArtifactResolutionResult addVersionRangeViolation( Exception e )
{
-if ( versionRangeViolations == null )
-{
-versionRangeViolations = new ArrayList();
-}
+initList( versionRangeViolations );
versionRangeViolations.add( e );
@@ -173,12 +175,9 @@
return metadataResolutionExceptions != null;
}
-public ArtifactResolutionResult addMetadataResolutionException( Exception
e )
+public ArtifactResolutionResult addMetadataResolutionException(
ArtifactResolutionException e )
{
-if ( metadataResolutionExceptions == null )
-{
-metadataResolutionExceptions = new ArrayList();
-}
+initList( metadataResolutionExceptions );
metadataResolutionExceptions.add( e );
@@ -204,12 +203,9 @@
return errorArtifactExceptions != null;
}
-public ArtifactResolutionResult addErrorArtifactException( Exception e )
+public ArtifactResolutionResult addErrorArtifactException(
ArtifactResolutionException e )
{
-if ( errorArtifactExceptions == null )
-{
-errorArtifactExceptions = new ArrayList();
-}
+initList( errorArtifactExceptions );
errorArtifactExceptions.add( e );
@@ -230,14 +226,11 @@
return circularDependencyExceptions != null;
}
-public ArtifactResolutionResult addCircularDependencyException( Exception
e )
+public ArtifactResolutionResult addCircularDependencyException(
CyclicDependencyException e )
{
-if ( circularDependencyExceptions == null )
-{
-circularDependencyExceptions = new ArrayList();
-}
+initList( circularDependencyExceptions );
-errorArtifactExceptions.add( e );
+circularDependencyExceptions.add( e );
return this;
}
@@ -270,5 +263,11 @@
return this;
}
-
+private void initList( List l )
+{
+if ( l == null )
+{
+l = new ArrayList();
+}
+}
}
svn commit: r588017 - /maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
Author: carlos
Date: Wed Oct 24 13:56:28 2007
New Revision: 588017
URL: http://svn.apache.org/viewvc?rev=588017view=rev
Log:
Fix dumb mistake with initList
Modified:
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
Modified:
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
URL:
http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java?rev=588017r1=588016r2=588017view=diff
==
---
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
(original)
+++
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
Wed Oct 24 13:56:28 2007
@@ -119,7 +119,7 @@
public ArtifactResolutionResult addMissingArtifact( Artifact artifact )
{
-initList( missingArtifacts );
+missingArtifacts = initList( missingArtifacts );
missingArtifacts.add( artifact );
@@ -149,7 +149,7 @@
*/
public ArtifactResolutionResult addVersionRangeViolation( Exception e )
{
-initList( versionRangeViolations );
+versionRangeViolations = initList( versionRangeViolations );
versionRangeViolations.add( e );
@@ -177,7 +177,7 @@
public ArtifactResolutionResult addMetadataResolutionException(
ArtifactResolutionException e )
{
-initList( metadataResolutionExceptions );
+metadataResolutionExceptions = initList( metadataResolutionExceptions
);
metadataResolutionExceptions.add( e );
@@ -205,7 +205,7 @@
public ArtifactResolutionResult addErrorArtifactException(
ArtifactResolutionException e )
{
-initList( errorArtifactExceptions );
+errorArtifactExceptions = initList( errorArtifactExceptions );
errorArtifactExceptions.add( e );
@@ -228,7 +228,7 @@
public ArtifactResolutionResult addCircularDependencyException(
CyclicDependencyException e )
{
-initList( circularDependencyExceptions );
+circularDependencyExceptions = initList( circularDependencyExceptions
);
circularDependencyExceptions.add( e );
@@ -263,11 +263,12 @@
return this;
}
-private void initList( List l )
+private List initList( List l )
{
if ( l == null )
{
-l = new ArrayList();
+return new ArrayList();
}
+return l;
}
}
svn commit: r588021 - in /maven/components/branches/maven-2.0.x/maven-artifact/src: main/java/org/apache/maven/artifact/metadata/ArtifactMetadataRetrievalException.java test/java/org/apache/maven/arti
Author: carlos
Date: Wed Oct 24 14:02:49 2007
New Revision: 588021
URL: http://svn.apache.org/viewvc?rev=588021view=rev
Log:
Add an artifact field to ArtifactMetadataRetrievalException to store the
artifact causing the problem. Merged 587991 from trunk
Modified:
maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataRetrievalException.java
maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java
Modified:
maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataRetrievalException.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataRetrievalException.java?rev=588021r1=588020r2=588021view=diff
==
---
maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataRetrievalException.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataRetrievalException.java
Wed Oct 24 14:02:49 2007
@@ -19,6 +19,8 @@
* under the License.
*/
+import org.apache.maven.artifact.Artifact;
+
/**
* Error while retrieving repository metadata from the repository.
*
@@ -28,18 +30,41 @@
public class ArtifactMetadataRetrievalException
extends Exception
{
+
+private Artifact artifact;
+
+/**
+ * @deprecated use [EMAIL PROTECTED]
#ArtifactMetadataRetrievalException(String, Throwable, Artifact)}
+ */
public ArtifactMetadataRetrievalException( String message )
{
-super( message );
+this( message, null, null );
}
+/**
+ * @deprecated use [EMAIL PROTECTED]
#ArtifactMetadataRetrievalException(String, Throwable, Artifact)}
+ */
public ArtifactMetadataRetrievalException( Throwable cause )
{
-super( cause );
+this( null, cause, null );
}
+/**
+ * @deprecated use [EMAIL PROTECTED]
#ArtifactMetadataRetrievalException(String, Throwable, Artifact)}
+ */
public ArtifactMetadataRetrievalException( String message, Throwable cause
)
{
+this( message, cause, null );
+}
+
+public ArtifactMetadataRetrievalException( String message, Throwable
cause, Artifact artifact )
+{
super( message, cause );
+this.artifact = artifact;
+}
+
+public Artifact getArtifact()
+{
+return artifact;
}
}
Modified:
maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java?rev=588021r1=588020r2=588021view=diff
==
---
maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java
Wed Oct 24 14:02:49 2007
@@ -820,7 +820,7 @@
}
catch ( InvalidVersionSpecificationException e )
{
-throw new ArtifactMetadataRetrievalException( e );
+throw new ArtifactMetadataRetrievalException( Invalid version
creating artifacts, e, artifact );
}
}
svn commit: r588022 - /maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
Author: carlos
Date: Wed Oct 24 14:04:49 2007
New Revision: 588022
URL: http://svn.apache.org/viewvc?rev=588022view=rev
Log:
Add an artifact field to ArtifactMetadataRetrievalException to store the
artifact causing the problem. Merged 587991 from trunk
Modified:
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
Modified:
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java?rev=588022r1=588021r2=588022view=diff
==
---
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
Wed Oct 24 14:04:49 2007
@@ -109,13 +109,15 @@
if ( g.equals( artifact.getArtifactId() ) )
{
+Artifact a = null;
try
{
-dependencies.add( createArtifact( org.apache.maven,
h, 1.0, jar ) );
+a = createArtifact( org.apache.maven, h, 1.0,
jar );
+dependencies.add( a );
}
catch ( Exception e )
{
-throw new ArtifactMetadataRetrievalException( e );
+throw new ArtifactMetadataRetrievalException( Error
retrieving metadata, e, a );
}
}
@@ -163,13 +165,15 @@
if ( i.equals( artifact.getArtifactId() ) )
{
+Artifact a = null;
try
{
-dependencies.add( createArtifact( org.apache.maven,
j, 1.0, jar ) );
+a = createArtifact( org.apache.maven, j, 1.0,
jar );
+dependencies.add( a );
}
catch ( Exception e )
{
-throw new ArtifactMetadataRetrievalException( e );
+throw new ArtifactMetadataRetrievalException( Error
retrieving metadata, e, a );
}
}
svn commit: r588024 - /maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Author: carlos
Date: Wed Oct 24 14:09:14 2007
New Revision: 588024
URL: http://svn.apache.org/viewvc?rev=588024view=rev
Log:
Add an artifact field to ArtifactMetadataRetrievalException to store the
artifact causing the problem. Merged 587996 from trunk
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=588024r1=588023r2=588024view=diff
==
---
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Wed Oct 24 14:09:14 2007
@@ -132,7 +132,7 @@
catch ( ProjectBuildingException e )
{
throw new ArtifactMetadataRetrievalException( Unable to
read the metadata file for artifact ' +
-artifact.getDependencyConflictId() + ': +
e.getMessage(), e );
+artifact.getDependencyConflictId() + ': +
e.getMessage(), e, artifact );
}
if ( project != null )
svn commit: r588029 - in /maven/components/trunk: ./ maven-core/ maven-core/src/main/java/org/apache/maven/ maven-core/src/main/java/org/apache/maven/execution/ maven-core/src/main/java/org/apache/mav
Author: jdcasey
Date: Wed Oct 24 14:14:27 2007
New Revision: 588029
URL: http://svn.apache.org/viewvc?rev=588029view=rev
Log:
Cleaning up extension and plugin realms for a project once the build completes.
Modified:
maven/components/trunk/build.properties
maven/components/trunk/maven-core/pom.xml
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenProjectSession.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
maven/components/trunk/pom.xml
Modified: maven/components/trunk/build.properties
URL:
http://svn.apache.org/viewvc/maven/components/trunk/build.properties?rev=588029r1=588028r2=588029view=diff
==
--- maven/components/trunk/build.properties (original)
+++ maven/components/trunk/build.properties Wed Oct 24 14:14:27 2007
@@ -16,7 +16,7 @@
# under the License.
classworlds.version=1.2-alpha-10
-plexus.version=1.0-alpha-34
+plexus.version=1.0-alpha-35-SNAPSHOT
plexus-utils.version=1.4.5
maven-artifact.version=3.0-SNAPSHOT
commons-cli.version=1.0
Modified: maven/components/trunk/maven-core/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/pom.xml?rev=588029r1=588028r2=588029view=diff
==
--- maven/components/trunk/maven-core/pom.xml (original)
+++ maven/components/trunk/maven-core/pom.xml Wed Oct 24 14:14:27 2007
@@ -88,6 +88,7 @@
artifactIdmaven-plugin-api/artifactId
version2.1-SNAPSHOT/version
/dependency
+
dependency
groupIdorg.codehaus.plexus/groupId
artifactIdplexus-interactivity-api/artifactId
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=588029r1=588028r2=588029view=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
Wed Oct 24 14:14:27 2007
@@ -192,59 +192,66 @@
dispatcher,
projectSessions );
-for ( Iterator i = request.getGoals().iterator(); i.hasNext(); )
+try
{
-String goal = (String) i.next();
+for ( Iterator i = request.getGoals().iterator(); i.hasNext(); )
+{
+String goal = (String) i.next();
-TaskValidationResult tvr = lifecycleExecutor.isTaskValid( goal,
session, reactorManager.getTopLevelProject() );
+TaskValidationResult tvr = lifecycleExecutor.isTaskValid(
goal, session, reactorManager.getTopLevelProject() );
-if ( !tvr.isTaskValid() )
-{
-result.addBuildFailureException( new InvalidTaskException( tvr
) );
+if ( !tvr.isTaskValid() )
+{
+result.addBuildFailureException( new InvalidTaskException(
tvr ) );
-return result;
+return result;
+}
}
-}
-
-getLogger().info( Scanning for projects... );
-if ( reactorManager.hasMultipleProjects() )
-{
-getLogger().info( Reactor build order: );
+getLogger().info( Scanning for projects... );
-for ( Iterator i = reactorManager.getSortedProjects().iterator();
i.hasNext(); )
+if ( reactorManager.hasMultipleProjects() )
{
-MavenProject project = (MavenProject) i.next();
+getLogger().info( Reactor build order: );
-getLogger().info(+ project.getName() );
+for ( Iterator i =
reactorManager.getSortedProjects().iterator(); i.hasNext(); )
+{
+MavenProject project = (MavenProject) i.next();
+
+getLogger().info(+ project.getName() );
+}
}
-}
-initializeBuildContext( request );
+initializeBuildContext( request );
+
+try
+{
+lifecycleExecutor.execute(
+session,
+reactorManager,
+dispatcher );
+}
+catch ( LifecycleExecutionException e )
+{
+result.addLifecycleExecutionException( e );
+return result;
+}
+
svn commit: r588031 - /maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundlePackMojo.java
Author: hboutemy
Date: Wed Oct 24 14:18:16 2007
New Revision: 588031
URL: http://svn.apache.org/viewvc?rev=588031view=rev
Log:
read and write pom with UTF-8 instead of platform encoding
Modified:
maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundlePackMojo.java
Modified:
maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundlePackMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundlePackMojo.java?rev=588031r1=588030r2=588031view=diff
==
---
maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundlePackMojo.java
(original)
+++
maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundlePackMojo.java
Wed Oct 24 14:18:16 2007
@@ -19,10 +19,12 @@
package org.apache.maven.plugins.repository;
import java.io.File;
+import java.io.FileInputStream;
import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
import java.util.Collections;
import java.util.List;
@@ -166,7 +168,8 @@
Model model;
try
{
-model = new MavenXpp3Reader().read( new FileReader( pom ) );
+// TODO use ReaderFactory.newXmlReader() when plexus-utils is
upgraded to 1.4.5+
+model = new MavenXpp3Reader().read( new InputStreamReader( new
FileInputStream( pom ), UTF-8 ) );
}
catch ( XmlPullParserException e )
{
@@ -240,7 +243,8 @@
if ( rewrite )
{
-new MavenXpp3Writer().write( new FileWriter( pom ), model );
+// TODO use WriterFactory.newXmlWriter() when plexus-utils is
upgraded to 1.4.5+
+new MavenXpp3Writer().write( new OutputStreamWriter( new
FileOutputStream( pom ), UTF-8 ), model );
}
String finalName = null;
svn commit: r588034 - in /maven/components/trunk: maven-core/src/main/java/org/apache/maven/execution/ maven-embedder/src/main/java/org/apache/maven/cli/
Author: jdcasey
Date: Wed Oct 24 14:23:48 2007
New Revision: 588034
URL: http://svn.apache.org/viewvc?rev=588034view=rev
Log:
Fixing NPE in execution request. Apparently, bootstrap was not run after these
were changed.
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIRequestUtils.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java?rev=588034r1=588033r2=588034view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
Wed Oct 24 14:23:48 2007
@@ -39,7 +39,7 @@
implements MavenExecutionRequest
{
private ArtifactRepository localRepository;
-
+
private File localRepositoryPath;
private boolean offline = false;
@@ -81,7 +81,7 @@
private boolean useReactor = false;
private boolean recursive = true;
-
+
private File pom;
private String reactorFailureBehavior = REACTOR_FAIL_FAST;
@@ -111,7 +111,7 @@
private List remoteRepositories;
/**
- * Suppress SNAPSHOT updates.
+ * Suppress SNAPSHOT updates.
* @issue MNG-2681
*/
private boolean noSnapshotUpdates;
@@ -276,14 +276,14 @@
public MavenExecutionRequest setLocalRepositoryPath( File localRepository )
{
-this.localRepositoryPath = localRepository;
+localRepositoryPath = localRepository;
return this;
}
public MavenExecutionRequest setLocalRepositoryPath( String
localRepository )
{
-this.localRepositoryPath = new File( localRepository );
+localRepositoryPath = new File( localRepository );
return this;
}
@@ -316,7 +316,7 @@
public MavenExecutionRequest setReactorFailureBehavior( String
failureBehavior )
{
-this.reactorFailureBehavior = failureBehavior;
+reactorFailureBehavior = failureBehavior;
return this;
}
@@ -363,7 +363,7 @@
public MavenExecutionRequest setUseReactor( boolean reactorActive )
{
-this.useReactor = reactorActive;
+useReactor = reactorActive;
return this;
}
@@ -376,7 +376,10 @@
/** @deprecated use [EMAIL PROTECTED] #setPom(File)} */
public MavenExecutionRequest setPomFile( String pomFilename )
{
-this.pom = new File( pomFilename );
+if ( pomFilename != null )
+{
+pom = new File( pomFilename );
+}
return this;
}
@@ -390,7 +393,7 @@
public MavenExecutionRequest setInteractiveMode( boolean interactive )
{
-this.interactiveMode = interactive;
+interactiveMode = interactive;
return this;
}
@@ -438,7 +441,7 @@
}
//
-// Settings equivalents
+// Settings equivalents
//
public List getProxies()
@@ -591,7 +594,7 @@
remoteRepositories = new ArrayList();
}
-remoteRepositories.add( repository );
+remoteRepositories.add( repository );
return this;
}
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java?rev=588034r1=588033r2=588034view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
Wed Oct 24 14:23:48 2007
@@ -109,9 +109,8 @@
List getEventMonitors();
// Pom
-/** @deprecated use [EMAIL PROTECTED] #setPom(File)} */
MavenExecutionRequest setPomFile( String pomFilename );
-/** @deprecated use [EMAIL PROTECTED] #getPom()} */
+
String getPomFile();
MavenExecutionRequest setPom( File pom );
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIRequestUtils.java
URL:
svn commit: r588037 - in /maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install: AbstractInstallMojo.java InstallFileMojo.java
Author: hboutemy
Date: Wed Oct 24 14:26:14 2007
New Revision: 588037
URL: http://svn.apache.org/viewvc?rev=588037view=rev
Log:
read and write pom with UTF-8 instead of platform encoding
Modified:
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/AbstractInstallMojo.java
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
Modified:
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/AbstractInstallMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/AbstractInstallMojo.java?rev=588037r1=588036r2=588037view=diff
==
---
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/AbstractInstallMojo.java
(original)
+++
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/AbstractInstallMojo.java
Wed Oct 24 14:26:14 2007
@@ -26,8 +26,6 @@
import org.apache.maven.plugin.MojoExecutionException;
import org.codehaus.plexus.digest.Digester;
import org.codehaus.plexus.digest.DigesterException;
-import org.codehaus.plexus.digest.Md5Digester;
-import org.codehaus.plexus.digest.Sha1Digester;
import org.codehaus.plexus.util.FileUtils;
import java.io.File;
Modified:
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java?rev=588037r1=588036r2=588037view=diff
==
---
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
(original)
+++
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
Wed Oct 24 14:26:14 2007
@@ -37,11 +37,14 @@
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.File;
+import java.io.FileInputStream;
import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
import java.io.Reader;
+import java.io.Writer;
import java.net.MalformedURLException;
import java.util.Map;
@@ -171,7 +174,7 @@
ArtifactRepositoryLayout layout;
layout = ( ArtifactRepositoryLayout ) repositoryLayouts.get(
repositoryLayout );
-
+
getLog().info(Layout: + layout.getClass());
localRepository = new DefaultArtifactRepository(
localRepositoryId, localRepositoryPath.toURL()
.toString(), layout );
@@ -209,7 +212,7 @@
// TODO: check if it exists first, and default to true if not
if ( generatePom )
{
-FileWriter fw = null;
+Writer fw = null;
try
{
File tempFile = File.createTempFile( mvninstall, .pom );
@@ -222,7 +225,8 @@
model.setVersion( version );
model.setPackaging( packaging );
model.setDescription( POM was created from
install:install-file );
-fw = new FileWriter( tempFile );
+// TODO use WriterFactory.newXmlWriter() when plexus-utils is
upgraded to 1.4.5+
+fw = new OutputStreamWriter( new FileOutputStream( tempFile ),
UTF-8 );
tempFile.deleteOnExit();
new MavenXpp3Writer().write( fw, model );
metadata = new ProjectArtifactMetadata( artifact, tempFile );
@@ -298,7 +302,8 @@
Reader reader = null;
try
{
-reader = new FileReader( aFile );
+// TODO use ReaderFactory.newXmlReader() when plexus-utils is
upgraded to 1.4.5+
+reader = new InputStreamReader( new FileInputStream( aFile ),
UTF-8 );
MavenXpp3Reader mavenReader = new MavenXpp3Reader();
svn commit: r588038 - /maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
Author: hboutemy
Date: Wed Oct 24 14:28:08 2007
New Revision: 588038
URL: http://svn.apache.org/viewvc?rev=588038view=rev
Log:
read and write pom with UTF-8 instead of platform encoding
Modified:
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
Modified:
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java?rev=588038r1=588037r2=588038view=diff
==
---
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
(original)
+++
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
Wed Oct 24 14:28:08 2007
@@ -36,11 +36,14 @@
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.File;
+import java.io.FileInputStream;
import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
import java.io.Reader;
+import java.io.Writer;
import java.util.Map;
/**
@@ -221,7 +224,7 @@
// Create the artifact
Artifact artifact =
artifactFactory.createArtifactWithClassifier( groupId, artifactId,
version, packaging, classifier );
-
+
// Upload the POM if requested, generating one if need be
if ( generatePom )
{
@@ -270,11 +273,11 @@
}
if ( this.version == null )
{
- this.version = model.getVersion();
- if ( this.version == null parent != null )
- {
- this.version = parent.getVersion();
- }
+this.version = model.getVersion();
+if ( this.version == null parent != null )
+{
+this.version = parent.getVersion();
+}
}
if ( this.packaging == null model.getPackaging() != null )
{
@@ -301,7 +304,8 @@
Reader reader = null;
try
{
-reader = new FileReader( pomFile );
+// TODO use ReaderFactory.newXmlReader() when plexus-utils is
upgraded to 1.4.5+
+reader = new InputStreamReader( new FileInputStream( pomFile ),
UTF-8 );
MavenXpp3Reader modelReader = new MavenXpp3Reader();
return modelReader.read( reader );
}
@@ -326,7 +330,7 @@
private File generatePomFile()
throws MojoExecutionException
{
-FileWriter fw = null;
+Writer fw = null;
try
{
File tempFile = File.createTempFile( mvninstall, .pom );
@@ -340,7 +344,8 @@
model.setPackaging( packaging );
model.setDescription( description );
-fw = new FileWriter( tempFile );
+// TODO use WriterFactory.newXmlWriter() when plexus-utils is
upgraded to 1.4.5+
+fw = new OutputStreamWriter( new FileOutputStream( tempFile ),
UTF-8 );
new MavenXpp3Writer().write( fw, model );
return tempFile;
svn commit: r588042 - in /maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven: DefaultMaven.java execution/DefaultMavenExecutionRequest.java execution/MavenExecutionRequest
Author: carlos
Date: Wed Oct 24 14:30:52 2007
New Revision: 588042
URL: http://svn.apache.org/viewvc?rev=588042view=rev
Log:
Store the pom File object in the execution request instead of its path. Merged
587998-587999 from trunk
Modified:
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
Modified:
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=588042r1=588041r2=588042view=diff
==
---
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Wed Oct 24 14:30:52 2007
@@ -861,9 +861,9 @@
// make sure there is consistent ordering on all platforms, rather
than using the filesystem ordering
Collections.sort( files );
}
-else if ( request.getPomFile() != null )
+else if ( request.getPom() != null )
{
-File projectFile = new File( request.getPomFile()
).getAbsoluteFile();
+File projectFile = request.getPom().getAbsoluteFile();
if ( projectFile.exists() )
{
Modified:
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java?rev=588042r1=588041r2=588042view=diff
==
---
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
Wed Oct 24 14:30:52 2007
@@ -25,6 +25,7 @@
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.settings.Settings;
+import java.io.File;
import java.util.Date;
import java.util.List;
import java.util.Properties;
@@ -55,7 +56,7 @@
private boolean reactorActive;
-private String pomFilename;
+private File pom;
private String failureBehavior;
@@ -160,14 +161,26 @@
return reactorActive;
}
+/** @deprecated use [EMAIL PROTECTED] #setPom(File)} */
public void setPomFile( String pomFilename )
{
-this.pomFilename = pomFilename;
+this.pom = new File( pomFilename );
}
+public void setPom( File pom )
+{
+this.pom = pom;
+}
+
+/** @deprecated use [EMAIL PROTECTED] #getPom()} */
public String getPomFile()
{
-return pomFilename;
+return pom.getAbsolutePath();
+}
+
+public File getPom()
+{
+return pom;
}
public void setFailureBehavior( String failureBehavior )
Modified:
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java?rev=588042r1=588041r2=588042view=diff
==
---
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
Wed Oct 24 14:30:52 2007
@@ -25,6 +25,7 @@
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.settings.Settings;
+import java.io.File;
import java.util.Date;
import java.util.List;
import java.util.Properties;
@@ -59,9 +60,13 @@
boolean isReactorActive();
+/** @deprecated use [EMAIL PROTECTED] #setPom(File)} */
void setPomFile( String pomFile );
-
+/** @deprecated use [EMAIL PROTECTED] #getPom()} */
String getPomFile();
+
+void setPom( File pom );
+File getPom();
void setFailureBehavior( String failureBehavior );
svn commit: r588043 - in /maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven: DefaultMaven.java execution/DefaultMavenExecutionRequest.java execution/MavenExecutionRequest
Author: carlos
Date: Wed Oct 24 14:33:11 2007
New Revision: 588043
URL: http://svn.apache.org/viewvc?rev=588043view=rev
Log:
Revert 588042, not adding a new method to interface for backwards compatibility
Modified:
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
Modified:
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=588043r1=588042r2=588043view=diff
==
---
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Wed Oct 24 14:33:11 2007
@@ -861,9 +861,9 @@
// make sure there is consistent ordering on all platforms, rather
than using the filesystem ordering
Collections.sort( files );
}
-else if ( request.getPom() != null )
+else if ( request.getPomFile() != null )
{
-File projectFile = request.getPom().getAbsoluteFile();
+File projectFile = new File( request.getPomFile()
).getAbsoluteFile();
if ( projectFile.exists() )
{
Modified:
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java?rev=588043r1=588042r2=588043view=diff
==
---
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
Wed Oct 24 14:33:11 2007
@@ -25,7 +25,6 @@
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.settings.Settings;
-import java.io.File;
import java.util.Date;
import java.util.List;
import java.util.Properties;
@@ -56,7 +55,7 @@
private boolean reactorActive;
-private File pom;
+private String pomFilename;
private String failureBehavior;
@@ -161,26 +160,14 @@
return reactorActive;
}
-/** @deprecated use [EMAIL PROTECTED] #setPom(File)} */
public void setPomFile( String pomFilename )
{
-this.pom = new File( pomFilename );
+this.pomFilename = pomFilename;
}
-public void setPom( File pom )
-{
-this.pom = pom;
-}
-
-/** @deprecated use [EMAIL PROTECTED] #getPom()} */
public String getPomFile()
{
-return pom.getAbsolutePath();
-}
-
-public File getPom()
-{
-return pom;
+return pomFilename;
}
public void setFailureBehavior( String failureBehavior )
Modified:
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java?rev=588043r1=588042r2=588043view=diff
==
---
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
Wed Oct 24 14:33:11 2007
@@ -25,7 +25,6 @@
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.settings.Settings;
-import java.io.File;
import java.util.Date;
import java.util.List;
import java.util.Properties;
@@ -60,13 +59,9 @@
boolean isReactorActive();
-/** @deprecated use [EMAIL PROTECTED] #setPom(File)} */
void setPomFile( String pomFile );
-/** @deprecated use [EMAIL PROTECTED] #getPom()} */
-String getPomFile();
-void setPom( File pom );
-File getPom();
+String getPomFile();
void setFailureBehavior( String failureBehavior );
svn commit: r588050 - /maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java
Author: hboutemy
Date: Wed Oct 24 14:56:44 2007
New Revision: 588050
URL: http://svn.apache.org/viewvc?rev=588050view=rev
Log:
use ReaderFactory.newXmlReader() since plexus-util is upgraded to 1.4.5+
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java?rev=588050r1=588049r2=588050view=diff
==
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java
Wed Oct 24 14:56:44 2007
@@ -20,8 +20,6 @@
*/
import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -38,6 +36,7 @@
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
+import org.codehaus.plexus.util.ReaderFactory;
/**
* @author Edwin Punzalan
@@ -59,8 +58,7 @@
MavenXpp3Reader pomReader = new MavenXpp3Reader();
try
{
-// TODO use ReaderFactory.newXmlReader() when plexus-util is
upgraded to 1.4.5+
-model = pomReader.read( new InputStreamReader( new
FileInputStream( new File( getBasedir(), getPOM() ) ), UTF-8 ) );
+model = pomReader.read( ReaderFactory.newXmlReader( new File(
getBasedir(), getPOM() ) ) );
setModel( model );
}
catch ( Exception e )
svn commit: r588052 - /maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
Author: carlos
Date: Wed Oct 24 15:06:44 2007
New Revision: 588052
URL: http://svn.apache.org/viewvc?rev=588052view=rev
Log:
Do not return null collections, makes life easier for clients
Modified:
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
Modified:
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
URL:
http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java?rev=588052r1=588051r2=588052view=diff
==
---
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
(original)
+++
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
Wed Oct 24 15:06:44 2007
@@ -23,6 +23,7 @@
import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -99,7 +100,7 @@
public Set getArtifactResolutionNodes()
{
-return resolutionNodes;
+return resolutionNodes == null ? Collections.EMPTY_SET :
resolutionNodes;
}
public ArtifactResolutionResult setArtifactResolutionNodes( Set
resolutionNodes )
@@ -114,7 +115,7 @@
public List getMissingArtifacts()
{
-return missingArtifacts;
+return missingArtifacts == null ? Collections.EMPTY_LIST :
missingArtifacts;
}
public ArtifactResolutionResult addMissingArtifact( Artifact artifact )
@@ -163,7 +164,7 @@
public List getVersionRangeViolations()
{
-return versionRangeViolations;
+return versionRangeViolations == null ? Collections.EMPTY_LIST :
versionRangeViolations;
}
//
@@ -191,7 +192,7 @@
public List getMetadataResolutionExceptions()
{
-return metadataResolutionExceptions;
+return metadataResolutionExceptions == null ? Collections.EMPTY_LIST :
metadataResolutionExceptions;
}
//
@@ -214,7 +215,7 @@
public List getErrorArtifactExceptions()
{
-return errorArtifactExceptions;
+return errorArtifactExceptions == null ? Collections.EMPTY_LIST :
errorArtifactExceptions;
}
//
@@ -242,7 +243,7 @@
public List getCircularDependencyExceptions()
{
-return circularDependencyExceptions;
+return circularDependencyExceptions == null ? Collections.EMPTY_LIST :
circularDependencyExceptions;
}
//
@@ -253,7 +254,7 @@
public List getRepositories()
{
-return repositories;
+return repositories == null ? Collections.EMPTY_LIST : repositories;
}
public ArtifactResolutionResult setRepositories( List repositories )
svn commit: r588053 - /maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java
Author: carlos
Date: Wed Oct 24 15:08:01 2007
New Revision: 588053
URL: http://svn.apache.org/viewvc?rev=588053view=rev
Log:
Do not return null collections, makes life easier for clients
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java?rev=588053r1=588052r2=588053view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java
Wed Oct 24 15:08:01 2007
@@ -29,6 +29,7 @@
import org.apache.maven.reactor.MavenExecutionException;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
/** @author Jason van Zyl */
@@ -83,7 +84,7 @@
public List getExceptions()
{
-return exceptions;
+return exceptions == null ? Collections.EMPTY_LIST : exceptions;
}
public MavenExecutionResult addExtensionScanningException(
ExtensionScanningException e )
@@ -147,7 +148,7 @@
public boolean hasExceptions()
{
-return (( exceptions != null ) ( exceptions.size() 0 ) );
+return !getExceptions().isEmpty();
}
public ReactorManager getReactorManager()
svn commit: r588058 - /maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/ExecutionBuildContext.java
Author: carlos
Date: Wed Oct 24 15:24:45 2007
New Revision: 588058
URL: http://svn.apache.org/viewvc?rev=588058view=rev
Log:
Store the pom File object in the execution request instead of its path, fix
possible null values
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/ExecutionBuildContext.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/ExecutionBuildContext.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/ExecutionBuildContext.java?rev=588058r1=588057r2=588058view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/ExecutionBuildContext.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/ExecutionBuildContext.java
Wed Oct 24 15:24:45 2007
@@ -108,7 +108,7 @@
public String getPomFile()
{
-return request.getPom().getAbsolutePath();
+return request.getPom() == null ? null :
request.getPom().getAbsolutePath();
}
public List getProfiles()
svn commit: r588059 - /maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
Author: carlos
Date: Wed Oct 24 15:25:28 2007
New Revision: 588059
URL: http://svn.apache.org/viewvc?rev=588059view=rev
Log:
Store the pom File object in the execution request instead of its path
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=588059r1=588058r2=588059view=diff
==
---
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
(original)
+++
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
Wed Oct 24 15:25:28 2007
@@ -323,7 +323,7 @@
try
{
-pluginManager.verifyPlugin( plugin, project, session );
+pluginManager.verifyPlugin( plugin, project, session );
}
finally
{
@@ -478,7 +478,7 @@
Map handlers = findArtifactTypeHandlers( project );
-//TODO: ok this is crappy, now there are active collections so
when new artifact handlers
+//TODO: ok this is crappy, now there are active collections so
when new artifact handlers
// enter the system they should be available.
artifactHandlerManager.addHandlers( handlers );
@@ -508,7 +508,7 @@
try
{
projectBuildingResult = mavenProjectBuilder.buildWithDependencies(
-new File( request.getPomFile() ),
+request.getPom(),
request.getLocalRepository(),
request.getProfileManager() );
}
@@ -652,8 +652,8 @@
try
{
-ContainerConfiguration cc = new DefaultContainerConfiguration()
-.addComponentDiscoverer( new MavenPluginDiscoverer() )
+ContainerConfiguration cc = new DefaultContainerConfiguration()
+.addComponentDiscoverer( new MavenPluginDiscoverer() )
.addComponentDiscoveryListener( new MavenPluginCollector() )
.setClassWorld( classWorld ).setParentContainer(
configuration.getParentContainer() ).setName( embedder );
svn commit: r588060 - in /maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder: MavenEmbedderProjectWithExtensionReadingTest.java MavenEmbedderTest.java
Author: carlos
Date: Wed Oct 24 15:25:48 2007
New Revision: 588060
URL: http://svn.apache.org/viewvc?rev=588060view=rev
Log:
Store the pom File object in the execution request instead of its path
Modified:
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderProjectWithExtensionReadingTest.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
Modified:
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderProjectWithExtensionReadingTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderProjectWithExtensionReadingTest.java?rev=588060r1=588059r2=588060view=diff
==
---
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderProjectWithExtensionReadingTest.java
(original)
+++
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderProjectWithExtensionReadingTest.java
Wed Oct 24 15:25:48 2007
@@ -21,7 +21,7 @@
throws Exception
{
MavenExecutionRequest request = new
DefaultMavenExecutionRequest().setShowErrors( true )
-.setPomFile( new File( basedir, src/test/resources/pom2.xml
).getAbsolutePath() );
+.setPom( new File( basedir, src/test/resources/pom2.xml ) );
ClassLoader classLoader =
Thread.currentThread().getContextClassLoader();
Modified:
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java?rev=588060r1=588059r2=588060view=diff
==
---
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
(original)
+++
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
Wed Oct 24 15:25:48 2007
@@ -141,10 +141,9 @@
FileUtils.copyDirectoryStructure( testDirectory, targetDirectory );
-MavenExecutionRequest request =
-new DefaultMavenExecutionRequest().setPomFile( new File(
targetDirectory, pom.xml )
-.getAbsolutePath() )
-.setShowErrors( true ).setGoals( Arrays.asList( new
String[]{package} ) );
+MavenExecutionRequest request = new DefaultMavenExecutionRequest()
+.setPom( new File( targetDirectory, pom.xml ) ).setShowErrors(
true )
+.setGoals( Arrays.asList( new String[] { package } ) );
MavenExecutionResult result = maven.execute( request );
@@ -171,8 +170,8 @@
// Check with profile not active
MavenExecutionRequest requestWithoutProfile = new
DefaultMavenExecutionRequest()
-.setPomFile( new File( targetDirectory, pom.xml
).getAbsolutePath() ).setShowErrors( true )
-.setGoals( Arrays.asList( new String[]{validate} ) );
+.setPom( new File( targetDirectory, pom.xml ) ).setShowErrors(
true )
+.setGoals( Arrays.asList( new String[] { validate } ) );
MavenExecutionResult r0 = maven.execute( requestWithoutProfile );
@@ -188,11 +187,11 @@
// Check with profile activated
-MavenExecutionRequest request =
-new DefaultMavenExecutionRequest().setPomFile( new File(
targetDirectory, pom.xml )
-.getAbsolutePath() )
-.setShowErrors( true ).setGoals( Arrays.asList( new
String[]{validate} ) )
-.addActiveProfile( embedderProfile );
+MavenExecutionRequest request = new DefaultMavenExecutionRequest()
+.setPom( new File( targetDirectory, pom.xml ) )
+.setShowErrors( true )
+.setGoals( Arrays.asList( new String[] { validate } ) )
+.addActiveProfile( embedderProfile );
MavenExecutionResult r1 = maven.execute( request );
@@ -235,8 +234,8 @@
writer.close();
/* execute maven */
-MavenExecutionRequest request = new
DefaultMavenExecutionRequest().setPomFile( pom.getAbsolutePath() )
-.setShowErrors( true ).setGoals( Arrays.asList( new String[] {
package } ) );
+MavenExecutionRequest request = new
DefaultMavenExecutionRequest().setPom( pom ).setShowErrors( true )
+.setGoals( Arrays.asList( new String[] { package } ) );
MavenExecutionResult result = maven.execute( request );
@@ -254,7 +253,7 @@
writer.close();
/* execute Maven */
-request = new DefaultMavenExecutionRequest().setPomFile(
pom.getAbsolutePath() ).setShowErrors( true )
+request = new DefaultMavenExecutionRequest().setPom( pom
).setShowErrors( true )
svn commit: r588066 - /maven/components/trunk/pom.xml
Author: jdcasey Date: Wed Oct 24 15:47:02 2007 New Revision: 588066 URL: http://svn.apache.org/viewvc?rev=588066view=rev Log: adding codehaus snapshots with todo to disable once plexus is released again. Modified: maven/components/trunk/pom.xml Modified: maven/components/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?rev=588066r1=588065r2=588066view=diff == --- maven/components/trunk/pom.xml (original) +++ maven/components/trunk/pom.xml Wed Oct 24 15:47:02 2007 @@ -40,6 +40,18 @@ systemjira/system urlhttp://jira.codehaus.org/browse/MNG/url /issueManagement + + !-- TODO: Disable this once we've released the next version of plexus-container-default. -- + repositories +repository + idcodehaus.snapshots/id + urlhttp://snapshots.repository.codehaus.org//url + releases +enabledfalse/enabled + /releases +/repository + /repositories + mailingLists mailingList nameMaven User List/name
svn commit: r588090 - in /maven/components/branches/maven-2.0.x/maven-project/src: main/java/org/apache/maven/project/inheritance/ test/java/org/apache/maven/project/inheritance/
Author: brianf
Date: Wed Oct 24 17:11:46 2007
New Revision: 588090
URL: http://svn.apache.org/viewvc?rev=588090view=rev
Log:
reverting MNG-3244. This caused MNG-3254
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java?rev=588090r1=588089r2=588090view=diff
==
---
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
Wed Oct 24 17:11:46 2007
@@ -432,7 +432,7 @@
site.setUrl( parentDistMgmt.getSite().getUrl() );
-if ( site.getUrl() != null (site.getUrl().endsWith( /
)|| site.getUrl().endsWith( \\ )))
+if ( site.getUrl() != null )
{
site.setUrl(
appendPath( site.getUrl(), child.getArtifactId(),
childPathAdjustment, appendPaths ) );
@@ -494,30 +494,10 @@
if ( appendPaths )
{
if ( pathAdjustment != null )
-{
-if (uncleanPath.endsWith( / )|| uncleanPath.endsWith( \\ ))
-{
-uncleanPath += pathAdjustment;
-
-}
-else
-{
-uncleanPath += / + pathAdjustment;
-}
-}
+uncleanPath += / + pathAdjustment;
if ( childPath != null )
-{
-
-if (uncleanPath.endsWith( / )|| uncleanPath.endsWith( \\ ))
-{
-uncleanPath += childPath;
-}
-else
-{
-uncleanPath += / + childPath;
-}
-}
+uncleanPath += / + childPath;
}
String cleanedPath = ;
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java?rev=588090r1=588089r2=588090view=diff
==
---
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java
Wed Oct 24 17:11:46 2007
@@ -53,66 +53,6 @@
{
private ModelInheritanceAssembler assembler = new
DefaultModelInheritanceAssembler();
-public void
testSiteUrlWithTrailingForwardSlashInParentHasArtifactIdAppendedInChild()
-{
- Site site = new Site();
- site.setName(docs);
- site.setUrl(sftp://machine/path/to/site/;);
-
- DistributionManagement distributionManagement = new
DistributionManagement();
- distributionManagement.setSite(site);
-
- Model parent = makeBaseModel( parent );
- parent.setDistributionManagement(distributionManagement);
-
- Model child = makeBaseModel( child );
- child.setParent(parent.getParent());
-
- assembler.assembleModelInheritance(child, parent);
-
- assertEquals(site.getUrl()+ child,
child.getDistributionManagement().getSite().getUrl());
-}
-
-public void
testSiteUrlWithTrailingBackSlashInParentHasArtifactIdAppendedInChild()
-{
- Site site = new Site();
- site.setName(docs);
- site.setUrl(file://machine\\path\\to\\site\\);
-
- DistributionManagement distributionManagement = new
DistributionManagement();
- distributionManagement.setSite(site);
-
- Model parent = makeBaseModel( parent );
- parent.setDistributionManagement(distributionManagement);
-
- Model child = makeBaseModel( child );
- child.setParent(parent.getParent());
-
- assembler.assembleModelInheritance(child, parent);
-
- assertEquals(site.getUrl()+ child,
svn commit: r588110 - /maven/components/trunk/maven-core/pom.xml
Author: jdcasey Date: Wed Oct 24 18:51:17 2007 New Revision: 588110 URL: http://svn.apache.org/viewvc?rev=588110view=rev Log: Exclusion for plexus-component-api on plexus-interactivity-api. Modified: maven/components/trunk/maven-core/pom.xml Modified: maven/components/trunk/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/pom.xml?rev=588110r1=588109r2=588110view=diff == --- maven/components/trunk/maven-core/pom.xml (original) +++ maven/components/trunk/maven-core/pom.xml Wed Oct 24 18:51:17 2007 @@ -93,6 +93,12 @@ groupIdorg.codehaus.plexus/groupId artifactIdplexus-interactivity-api/artifactId version1.0-alpha-6/version + exclusions +exclusion + groupIdorg.codehaus.plexus/groupId + artifactIdplexus-component-api/artifactId +/exclusion + /exclusions /dependency dependency groupIdorg.codehaus.plexus/groupId
svn commit: r588124 - in /maven/sandbox/trunk/archetypeng/archetypeng-common/src: main/java/org/apache/maven/archetype/source/ test/java/org/apache/maven/archetype/source/ test/sources/wiki/
Author: jvanzyl
Date: Wed Oct 24 20:19:14 2007
New Revision: 588124
URL: http://svn.apache.org/viewvc?rev=588124view=rev
Log:
o using the correct wiki source data and cleaning up test, adding a test for
the wiki source
Added:
maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java
(with props)
Modified:
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/WikiArchetypeDataSource.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/source/CatalogArchetypeDataSinkTest.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/sources/wiki/wiki-source.txt
Modified:
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/WikiArchetypeDataSource.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/WikiArchetypeDataSource.java?rev=588124r1=588123r2=588124view=diff
==
---
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/WikiArchetypeDataSource.java
(original)
+++
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/source/WikiArchetypeDataSource.java
Wed Oct 24 20:19:14 2007
@@ -86,6 +86,8 @@
Pattern ptn = Pattern.compile(
br\\|([-a-zA-Z0-9_. ]+)\\|([-a-zA-Z0-9_. ]+)\\|([-a-zA-Z0-9_.
]+)\\|([-a-zA-Z0-9_.:/ \\[\\],]+)\\|([^|]+)\\| );
+System.out.println( sb.toString() = + sb.toString() );
+
Matcher m = ptn.matcher( sb.toString() );
while ( m.find() )
Modified:
maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/source/CatalogArchetypeDataSinkTest.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/source/CatalogArchetypeDataSinkTest.java?rev=588124r1=588123r2=588124view=diff
==
---
maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/source/CatalogArchetypeDataSinkTest.java
(original)
+++
maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/source/CatalogArchetypeDataSinkTest.java
Wed Oct 24 20:19:14 2007
@@ -71,9 +71,15 @@
Properties p = new Properties();
-p.setProperty( WikiArchetypeDataSource.URL, new File( getBasedir(),
test/sources/wiki-source.txt ).toURI().toURL().toExternalForm() );
+File wikiSource = new File( getBasedir(),
src/test/sources/wiki/wiki-source.txt );
-sink.putArchetypes( new WikiArchetypeDataSource(), null , writer );
+assertTrue( wikiSource.exists() );
+
+p.setProperty( WikiArchetypeDataSource.URL,
wikiSource.toURI().toURL().toExternalForm() );
+
+ArchetypeDataSource ads = new WikiArchetypeDataSource();
+
+sink.putArchetypes( ads, p, writer );
StringReader reader = new StringReader( writer.toString() );
@@ -81,10 +87,8 @@
ArchetypeCatalog catalog = catalogReader.read( reader );
-Archetyper archetype = (Archetyper) lookup( Archetyper.ROLE );
-
-int size = archetype.getAvailableArchetypes().size();
+int catalogSize = catalog.getArchetypes().size();
-assertEquals( size, catalog.getArchetypes().size() );
+assertEquals( 37, catalogSize );
}
}
Added:
maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java?rev=588124view=auto
==
---
maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java
(added)
+++
maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java
Wed Oct 24 20:19:14 2007
@@ -0,0 +1,30 @@
+package org.apache.maven.archetype.source;
+
+import org.codehaus.plexus.PlexusTestCase;
+
+import java.io.File;
+import java.util.List;
+import java.util.Properties;
+
+/** @author Jason van Zyl */
+public class WikiArchetypeDataSourceTest
+extends PlexusTestCase
+{
+public void testWikiArchetypeDataSource()
+throws Exception
+{
+Properties p = new Properties();
+
+File wikiSource = new File( getBasedir(),
src/test/sources/wiki/wiki-source.txt );
+
+assertTrue( wikiSource.exists() );
+
+p.setProperty(
svn commit: r588136 - in /maven/components/trunk/maven-core/src: main/java/org/apache/maven/extension/ test/java/org/apache/maven/execution/
Author: jdcasey
Date: Wed Oct 24 21:04:04 2007
New Revision: 588136
URL: http://svn.apache.org/viewvc?rev=588136view=rev
Log:
Adding a couple unit tests for the project-level session, and fixing potential
NPE when an extension is declared that already exists in the core distribution.
Added:
maven/components/trunk/maven-core/src/test/java/org/apache/maven/execution/
maven/components/trunk/maven-core/src/test/java/org/apache/maven/execution/MavenProjectSessionTest.java
(with props)
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/ExtensionManagerException.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java?rev=588136r1=588135r2=588136view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
Wed Oct 24 21:04:04 2007
@@ -28,8 +28,7 @@
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.metadata.ResolutionGroup;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
-import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
@@ -65,9 +64,8 @@
import java.net.MalformedURLException;
import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -207,11 +205,19 @@
projectSessions.put( projectId, projectSession );
}
-// if the extension is null, or if it's already been added to the
current project-session, skip it.
-if ( ( extensionArtifact != null )
!projectSession.containsExtensionRealm( extensionArtifact ) )
+ArtifactFilter coreFilter = artifactFilterManager.getArtifactFilter();
+
+// if the extension is null,
+// if it's already been added to the current project-session,
+// or if it's excluded by the core filter,
+//
+// skip it.
+if ( ( extensionArtifact != null )
+ !projectSession.containsExtensionRealm( extensionArtifact )
+ coreFilter.include( extensionArtifact ) )
{
ArtifactFilter filter =
-new ProjectArtifactExceptionFilter(
artifactFilterManager.getArtifactFilter(), projectArtifact );
+new ProjectArtifactExceptionFilter( coreFilter,
projectArtifact );
ResolutionGroup resolutionGroup;
@@ -229,25 +235,32 @@
// not declare plexus-utils but need it. MNG-2900
DefaultPluginManager.checkPlexusUtils( resolutionGroup,
artifactFactory );
-Set dependencies = new HashSet( resolutionGroup.getArtifacts() );
+Set dependencies = new LinkedHashSet();
dependencies.add( extensionArtifact );
+dependencies.addAll( resolutionGroup.getArtifacts() );
+
+ArtifactResolutionRequest dependencyReq = new
ArtifactResolutionRequest().setArtifact( projectArtifact )
+
.setArtifactDependencies( dependencies )
+
.setFilter( filter )
+
.setLocalRepository( localRepository )
+
.setRemoteRepostories( remoteRepositories )
+
.setMetadataSource( artifactMetadataSource );
// TODO: Make this work with managed dependencies, or an analogous
management section in the POM.
-ArtifactResolutionResult result;
-try
-{
-result = artifactResolver.resolveTransitively( dependencies,
projectArtifact,
- Collections.EMPTY_MAP,
localRepository, remoteRepositories,
- artifactMetadataSource,
filter );
-}
-catch (
svn commit: r588144 - in /maven/components/trunk: maven-core/src/main/java/org/apache/maven/ maven-core/src/main/java/org/apache/maven/execution/ maven-core/src/main/java/org/apache/maven/extension/ m
Author: jdcasey
Date: Wed Oct 24 22:13:22 2007
New Revision: 588144
URL: http://svn.apache.org/viewvc?rev=588144view=rev
Log:
Improving the use of project sessions in the embedder, and exporting control
over the project session map to the embedder instead of Maven.execute().
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/Maven.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=588144r1=588143r2=588144view=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
Wed Oct 24 22:13:22 2007
@@ -63,7 +63,6 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -160,14 +159,12 @@
return reactorManager;
}
-public MavenExecutionResult execute( MavenExecutionRequest request )
+public MavenExecutionResult execute( MavenExecutionRequest request, Map
projectSessions )
{
request.setStartTime( new Date() );
MavenExecutionResult result = new DefaultMavenExecutionResult();
-Map projectSessions = new HashMap();
-
ReactorManager reactorManager = createReactorManager(
request,
result,
@@ -192,66 +189,59 @@
dispatcher,
projectSessions );
-try
+for ( Iterator i = request.getGoals().iterator(); i.hasNext(); )
{
-for ( Iterator i = request.getGoals().iterator(); i.hasNext(); )
-{
-String goal = (String) i.next();
-
-TaskValidationResult tvr = lifecycleExecutor.isTaskValid(
goal, session, reactorManager.getTopLevelProject() );
+String goal = (String) i.next();
-if ( !tvr.isTaskValid() )
-{
-result.addBuildFailureException( new InvalidTaskException(
tvr ) );
+TaskValidationResult tvr = lifecycleExecutor.isTaskValid( goal,
session, reactorManager.getTopLevelProject() );
-return result;
-}
-}
-
-getLogger().info( Scanning for projects... );
-
-if ( reactorManager.hasMultipleProjects() )
+if ( !tvr.isTaskValid() )
{
-getLogger().info( Reactor build order: );
-
-for ( Iterator i =
reactorManager.getSortedProjects().iterator(); i.hasNext(); )
-{
-MavenProject project = (MavenProject) i.next();
+result.addBuildFailureException( new InvalidTaskException( tvr
) );
-getLogger().info(+ project.getName() );
-}
+return result;
}
+}
-initializeBuildContext( request );
+getLogger().info( Scanning for projects... );
-try
-{
-lifecycleExecutor.execute(
-session,
-reactorManager,
-dispatcher );
-}
-catch ( LifecycleExecutionException e )
-{
-result.addLifecycleExecutionException( e );
-return result;
-}
-catch ( BuildFailureException e )
+if ( reactorManager.hasMultipleProjects() )
+{
+getLogger().info( Reactor build order: );
+
+for ( Iterator i = reactorManager.getSortedProjects().iterator();
i.hasNext(); )
{
-result.addBuildFailureException( e );
-return result;
-}
+MavenProject project = (MavenProject) i.next();
-result.setTopologicallySortedProjects(
reactorManager.getSortedProjects() );
+getLogger().info(+ project.getName() );
+}
+}
-result.setProject( reactorManager.getTopLevelProject() );
+initializeBuildContext( request );
+try
+{
+lifecycleExecutor.execute(
+session,
+reactorManager,
+dispatcher );
+}
+catch ( LifecycleExecutionException e )
+{
+
