svn commit: r693401 - /maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv
Author: nicolas Date: Tue Sep 9 01:22:28 2008 New Revision: 693401 URL: http://svn.apache.org/viewvc?rev=693401&view=rev Log: add com.google.code.gwtx groupId Modified: maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv Modified: maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv URL: http://svn.apache.org/viewvc/maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv?rev=693401&r1=693400&r2=693401&view=diff == --- maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv (original) +++ maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv Tue Sep 9 01:22:28 2008 @@ -75,6 +75,7 @@ "net.sf.gwt-widget","[EMAIL PROTECTED]:/home/nicolas/rsync-to-central","rsync_ssh","Nicolas De Loof","[EMAIL PROTECTED]",, "net.sf.hibernate4gwt","[EMAIL PROTECTED]:/home/nicolas/rsync-to-central","rsync_ssh","Nicolas De Loof","[EMAIL PROTECTED]",, "com.google.code.gwt-log","[EMAIL PROTECTED]:/home/nicolas/rsync-to-central","rsync_ssh","Nicolas De Loof","[EMAIL PROTECTED]",, +"com.google.code.gwtx","[EMAIL PROTECTED]:/home/nicolas/rsync-to-central","rsync_ssh","Nicolas De Loof","[EMAIL PROTECTED]",, "net.jcip","[EMAIL PROTECTED]:/home/nicolas/rsync-to-central","rsync_ssh","Nicolas De Loof","[EMAIL PROTECTED]",, "net.sf.beanlib","[EMAIL PROTECTED]:/home/nicolas/rsync-to-central","rsync_ssh","Nicolas De Loof","[EMAIL PROTECTED]",, "net.sf.ipsedixit","[EMAIL PROTECTED]:/home/groups/i/ip/ipsedixit/htdocs/m2repo/release","rsync_ssh","Jason Royals","[EMAIL PROTECTED]",,
svn commit: r693517 - /maven/core-integration-testing/trunk/core-integration-tests/pom.xml
Author: sisbell Date: Tue Sep 9 10:11:07 2008 New Revision: 693517 URL: http://svn.apache.org/viewvc?rev=693517&view=rev Log: Updated verifier to 1.2 SNAPSHOT. Fixes broken version ranges in IT. Modified: maven/core-integration-testing/trunk/core-integration-tests/pom.xml Modified: maven/core-integration-testing/trunk/core-integration-tests/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/pom.xml?rev=693517&r1=693516&r2=693517&view=diff == --- maven/core-integration-testing/trunk/core-integration-tests/pom.xml (original) +++ maven/core-integration-testing/trunk/core-integration-tests/pom.xml Tue Sep 9 10:11:07 2008 @@ -96,7 +96,7 @@ org.apache.maven.shared maven-verifier - 1.1-SNAPSHOT + 1.2-SNAPSHOT
svn commit: r693599 - /maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/
Author: sisbell
Date: Tue Sep 9 13:47:07 2008
New Revision: 693599
URL: http://svn.apache.org/viewvc?rev=693599&view=rev
Log:
Fixed version ranges: ITs excluded for Maven 3.0.
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0026Test.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0051Test.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0092Test.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0095Test.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0111PluginsThatRequireAResourceFromAnExtensionTest.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0114ExtensionThatProvidesResources.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3220ImportScopeTest.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3221InfiniteForking.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3485OverrideWagonExtensionTest.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3599useHttpProxyForWebDAV.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3652UserAgentHeader.java
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0026Test.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0026Test.java?rev=693599&r1=693598&r2=693599&view=diff
==
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0026Test.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0026Test.java
Tue Sep 9 13:47:07 2008
@@ -13,7 +13,7 @@
public MavenIT0026Test()
throws InvalidVersionSpecificationException
{
-super();
+super( "[,2.1.99)" );
}
/**
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0051Test.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0051Test.java?rev=693599&r1=693598&r2=693599&view=diff
==
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0051Test.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0051Test.java
Tue Sep 9 13:47:07 2008
@@ -14,7 +14,7 @@
public MavenIT0051Test()
throws InvalidVersionSpecificationException
{
-super();
+super( "[,2.1.99)" );
}
/**
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0092Test.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0092Test.java?rev=693599&r1=693598&r2=693599&view=diff
==
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0092Test.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0092Test.java
Tue Sep 9 13:47:07 2008
@@ -14,7 +14,7 @@
public MavenIT0092Test()
throws InvalidVersionSpecificationException
{
-super();
+super( "[,2.1.99)" );
}
/**
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/
svn commit: r693618 - /maven/components/branches/maven-2.1.0-M1-RC/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
Author: jdcasey Date: Tue Sep 9 14:15:32 2008 New Revision: 693618 URL: http://svn.apache.org/viewvc?rev=693618&view=rev Log: [MNG-3748] settings builder should use strict mode for the xml parser call. Modified: maven/components/branches/maven-2.1.0-M1-RC/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java Modified: maven/components/branches/maven-2.1.0-M1-RC/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-M1-RC/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java?rev=693618&r1=693617&r2=693618&view=diff == --- maven/components/branches/maven-2.1.0-M1-RC/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java (original) +++ maven/components/branches/maven-2.1.0-M1-RC/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java Tue Sep 9 14:15:32 2008 @@ -119,7 +119,7 @@ SettingsXpp3Reader modelReader = new SettingsXpp3Reader(); -settings = modelReader.read( sReader ); +settings = modelReader.read( sReader, true ); RuntimeInfo rtInfo = new RuntimeInfo( settings );
svn commit: r693625 - in /maven/sandbox/trunk/mercury: mercury-crypto/mercury-crypto-basic/src/test/java/org/apache/maven/mercury/crypto/pgp/ mercury-it/src/test/java/org/apache/maven/mercury/reposito
Author: ogusakov
Date: Tue Sep 9 14:36:18 2008
New Revision: 693625
URL: http://svn.apache.org/viewvc?rev=693625&view=rev
Log:
it's start Nexus once with soft restarts between tests. Auth still crashes, but
works fine with a standalone Nexus
Added:
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/Messages.properties
(props changed)
- copied unchanged from r693178,
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/Messages.properties
Modified:
maven/sandbox/trunk/mercury/mercury-crypto/mercury-crypto-basic/src/test/java/org/apache/maven/mercury/crypto/pgp/PgpStreamVerifierTest.java
maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java
maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryWriterM2NexusTest.java
maven/sandbox/trunk/mercury/mercury-pom/pom.xml
Modified:
maven/sandbox/trunk/mercury/mercury-crypto/mercury-crypto-basic/src/test/java/org/apache/maven/mercury/crypto/pgp/PgpStreamVerifierTest.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-crypto/mercury-crypto-basic/src/test/java/org/apache/maven/mercury/crypto/pgp/PgpStreamVerifierTest.java?rev=693625&r1=693624&r2=693625&view=diff
==
---
maven/sandbox/trunk/mercury/mercury-crypto/mercury-crypto-basic/src/test/java/org/apache/maven/mercury/crypto/pgp/PgpStreamVerifierTest.java
(original)
+++
maven/sandbox/trunk/mercury/mercury-crypto/mercury-crypto-basic/src/test/java/org/apache/maven/mercury/crypto/pgp/PgpStreamVerifierTest.java
Tue Sep 9 14:36:18 2008
@@ -35,7 +35,6 @@
PgpStreamVerifierFactory svf;
PgpStreamVerifier sv;
-
protected void setUp()
throws Exception
Modified:
maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java?rev=693625&r1=693624&r2=693625&view=diff
==
---
maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java
(original)
+++
maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java
Tue Sep 9 14:36:18 2008
@@ -39,12 +39,6 @@
public abstract class AbstractRepositoryWriterM2Test
extends PlexusTestCase
{
- public static final String TEST_NEXUS_ROLE = ForkedAppBooter.ROLE;
- public static final String TEST_NEXUS_HINT = "NexusForkedAppBooter";
-
- PlexusContainer plexus;
- ForkedAppBooter nexusForkedAppBooter;
-
Repository repo;
File targetDirectory;
@@ -77,17 +71,14 @@
File f;
File artifactBinary;
+
+ static PlexusContainer plexus;
- /** current test works with snapshots */
- abstract void setReleases() throws MalformedURLException;
+ /** current test works with snapshots
+ * @throws Exception */
+ abstract void setReleases() throws Exception;
/** current test works with releases */
- abstract void setSnapshots() throws MalformedURLException;
-
- protected boolean needNexus = false;
-
- protected String nexusTestUrl = "http://127.0.0.1:8091/nexus";;
- protected String nexusTestUser = "admin";
- protected String nexusTestPass = "admin123";
+ abstract void setSnapshots() throws Exception;
@Override
@@ -96,6 +87,9 @@
{
super.setUp();
+if( plexus == null )
+ plexus = getContainer();
+
pgpF = new PgpStreamVerifierFactory(
new StreamVerifierAttributes(
PgpStreamVerifierFactory.DEFAULT_EXTENSION, false, true )
, getClass().getResourceAsStream( publicKeyFile )
@@ -110,33 +104,20 @@
artifactBinary = File.createTempFile( "test-repo-writer", "bin" );
FileUtil.writeRawData( artifactBinary, getClass().getResourceAsStream(
"/maven-core-2.0.9.jar" ) );
-
-plexus = getContainer();
-if( needNexus )
-{
- nexusForkedAppBooter = (ForkedAppBooter)plexus.lookup( TEST_NEXUS_ROLE,
TEST_NEXUS_HINT );
- nexusForkedAppBooter.start();
- NexusClient client = new NexusRestClient();
- client.connect( nexusTestUrl, nexusTestUser, nexusTestPass );
- if( !client.isNexusStarted( true ) )
- {
-fail("Cannot start Nexus");
- }
- client.disconnect();
-}
}
+
@Override
protected void tearDown()
throws Exception
{
super.tearDown();
-if( nexusForkedAppBooter != null )
-{
- nexusForkedAppBooter.stop();
- nexusForkedAppBooter = null;
-
svn commit: r693627 - /maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/Nexus.java
Author: ogusakov
Date: Tue Sep 9 14:36:46 2008
New Revision: 693627
URL: http://svn.apache.org/viewvc?rev=693627&view=rev
Log:
it's start Nexus once with soft restarts between tests. Auth still crashes, but
works fine with a standalone Nexus
Added:
maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/Nexus.java
Added:
maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/Nexus.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/Nexus.java?rev=693627&view=auto
==
---
maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/Nexus.java
(added)
+++
maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/Nexus.java
Tue Sep 9 14:36:46 2008
@@ -0,0 +1,126 @@
+package org.apache.maven.mercury.repository.tests;
+
+import java.net.ConnectException;
+
+import org.codehaus.plexus.PlexusContainer;
+import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+import org.sonatype.appbooter.ForkedAppBooter;
+import org.sonatype.appbooter.ctl.AppBooterServiceException;
+import org.sonatype.nexus.client.NexusClient;
+import org.sonatype.nexus.client.rest.NexusRestClient;
+
+/**
+ *
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ *
+ */
+public class Nexus
+{
+ public static final String TEST_NEXUS_ROLE = ForkedAppBooter.ROLE;
+ public static final String TEST_NEXUS_HINT = "NexusForkedAppBooter";
+
+ public static String nexusTestUrl = "http://localhost:8091/nexus";;
+ public static String nexusTestUser = "admin";
+ public static String nexusTestPass = "admin123";
+
+ private static ForkedAppBooter nexusForkedAppBooter;
+
//--
+ private static void checkAppBooter( final PlexusContainer plexus )
+ throws AppBooterServiceException, ComponentLookupException
+ {
+if( nexusForkedAppBooter != null )
+ return;
+
+nexusForkedAppBooter = (ForkedAppBooter)plexus.lookup( TEST_NEXUS_ROLE,
TEST_NEXUS_HINT );
+
+nexusForkedAppBooter.start();
+
+Runtime.getRuntime().addShutdownHook
+(
+new Thread()
+{
+ PlexusContainer plx = plexus;
+ private ForkedAppBooter nexusFAB;
+
+ public void run()
+ {
+try
+{
+ nexusFAB = (ForkedAppBooter)plx.lookup( TEST_NEXUS_ROLE,
TEST_NEXUS_HINT );
+ nexusFAB.shutdown();
+}
+catch( Exception e )
+{
+ e.printStackTrace();
+ return;
+}
+ }
+}
+);
+ }
+
//--
+ public static void start( PlexusContainer plexus )
+ throws Exception
+ {
+checkAppBooter( plexus );
+
+NexusClient client = new NexusRestClient();
+
+client.connect( nexusTestUrl, nexusTestUser, nexusTestPass );
+
+try
+{
+ client.startNexus();
+ Thread.sleep( 3000L );
+}
+catch( Exception any ) {}
+
+if( !client.isNexusStarted( true ) )
+{
+ throw new Exception("Cannot start Nexus");
+}
+
+client.disconnect();
+ }
+
//--
+ public static void stop()
+ throws Exception
+ {
+NexusClient client = new NexusRestClient();
+
+client.connect( nexusTestUrl, nexusTestUser, nexusTestPass );
+
+try
+{
+ if( client.isNexusStarted( false ) )
+ {
+client.stopNexus();
+ }
+}
+catch( Exception any ) {}
+
+client.disconnect();
+
+Thread.sleep( 3000L );
+ }
+
//--
+ public static void shutdown( PlexusContainer plexus )
+ throws Exception
+ {
+
+if( nexusForkedAppBooter == null )
+ nexusForkedAppBooter = (ForkedAppBooter)plexus.lookup( TEST_NEXUS_ROLE,
TEST_NEXUS_HINT );
+
+try // if it was running before
+{
+ nexusForkedAppBooter.shutdown();
+ Thread.sleep( 3000L );
+}
+catch( Exception e ) {}
+
+ }
+
//--
+
//--
+}
svn commit: r693654 - in /maven/components/branches/maven-2.1.0-M1-RC: maven-core/src/main/java/org/apache/maven/cli/MavenCli.java pom.xml
Author: jdcasey
Date: Tue Sep 9 16:36:03 2008
New Revision: 693654
URL: http://svn.apache.org/viewvc?rev=693654&view=rev
Log:
[MNG-3748] Roll back modello plugin version to alpha-13 (the one 2.0.9 used) to
avoid problems with strict checking.
Modified:
maven/components/branches/maven-2.1.0-M1-RC/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
maven/components/branches/maven-2.1.0-M1-RC/pom.xml
Modified:
maven/components/branches/maven-2.1.0-M1-RC/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-M1-RC/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java?rev=693654&r1=693653&r2=693654&view=diff
==
---
maven/components/branches/maven-2.1.0-M1-RC/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
(original)
+++
maven/components/branches/maven-2.1.0-M1-RC/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
Tue Sep 9 16:36:03 2008
@@ -351,7 +351,7 @@
}
catch ( XmlPullParserException e )
{
-throw new SettingsConfigurationException( e.getMessage(),
e.getDetail(), e.getLineNumber(),
+throw new SettingsConfigurationException( e.getMessage(), e,
e.getLineNumber(),
e.getColumnNumber() );
}
Modified: maven/components/branches/maven-2.1.0-M1-RC/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-M1-RC/pom.xml?rev=693654&r1=693653&r2=693654&view=diff
==
--- maven/components/branches/maven-2.1.0-M1-RC/pom.xml (original)
+++ maven/components/branches/maven-2.1.0-M1-RC/pom.xml Tue Sep 9 16:36:03 2008
@@ -177,7 +177,7 @@
org.codehaus.modello
modello-maven-plugin
- 1.0-alpha-20
+ 1.0-alpha-13
site-docs
@@ -216,6 +216,14 @@
org/apache/maven/project/inheritance/ModelInheritanceAssembler*
org/apache/maven/execution/MavenExecutionRequest*
org/apache/maven/plugin/DefaultPluginManager*
+
org/apache/maven/settings/io/xpp3/SettingsXpp3Reader*
+
org/apache/maven/artifact/repository/metadata/io/xpp3/MetadataXpp3Reader*
+
org/apache/maven/model/io/xpp3/MavenXpp3Reader*
+
org/apache/maven/usability/plugin/io/xpp3/ParamdocXpp3Reader*
+
org/apache/maven/profiles/io/xpp3/ProfilesXpp3Reader*
+
org/apache/maven/plugin/registry/io/xpp3/PluginRegistryXpp3Reader*
+
org/apache/maven/plugin/lifecycle/io/xpp3/LifecycleMappingsXpp3Reader*
+
org/apache/maven/toolchain/model/io/xpp3/MavenToolchainsXpp3Reader*
svn commit: r693657 - in /maven/core-integration-testing/trunk/core-integration-tests/src/test: java/org/apache/maven/integrationtests/ resources/mng-3748-badSettingsXml/
Author: jdcasey
Date: Tue Sep 9 16:44:33 2008
New Revision: 693657
URL: http://svn.apache.org/viewvc?rev=693657&view=rev
Log:
[MNG-3748] integration test
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3748BadSettingsXmlTest.java
(with props)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3748-badSettingsXml/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3748-badSettingsXml/pom.xml
(with props)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3748-badSettingsXml/settings.xml
(with props)
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java?rev=693657&r1=693656&r2=693657&view=diff
==
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
Tue Sep 9 16:44:33 2008
@@ -76,6 +76,7 @@
MavenITmng3645POMSyntaxErrorTest
*/
+suite.addTestSuite( MavenITmng3748BadSettingsXmlTest.class );
suite.addTestSuite( MavenITmng3747PrefixedPathExpressionTest.class );
suite.addTestSuite( MavenITmng3746POMPropertyOverrideTest.class );
suite.addTestSuite( MavenITmng3743ForkWithPluginManagementTest.class );
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3748BadSettingsXmlTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3748BadSettingsXmlTest.java?rev=693657&view=auto
==
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3748BadSettingsXmlTest.java
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3748BadSettingsXmlTest.java
Tue Sep 9 16:44:33 2008
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.maven.integrationtests;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+/**
+ * This is a test set for http://jira.codehaus.org/browse/MNG-3748";>MNG-3748.
+ *
+ * Verifies that the settings.xml file is parsed using strict mode, such that
invalid
+ * xml will cause an error (specifically, when repositories are not contained
within a profile declaration)
+ *
+ * @author jdcasey
+ *
+ */
+public class MavenITmng3748BadSettingsXmlTest
+extends AbstractMavenIntegrationTestCase
+{
+public MavenITmng3748BadSettingsXmlTest()
+throws InvalidVersionSpecificationException
+{
+super( "(2.0.8,)" ); // only test in 2.0.9+
+}
+
+public void testitMNG3748 ()
+throws Exception
+{
+File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-3748-badSettingsXml" );
+
+Verifier verifier;
+
+verifier = new Verifier( testDir.getAbsolutePath() );
+
+List cliOptions = new ArrayList();
+cliOptions.add( "-s" );
+cliOptions.add( "settings.xml" );
+
svn commit: r693659 - in /maven/components/branches/maven-2.1.0-M1-RC: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ m
Author: jdcasey Date: Tue Sep 9 16:48:57 2008 New Revision: 693659 URL: http://svn.apache.org/viewvc?rev=693659&view=rev Log: [maven-release-plugin] prepare release maven-2.1.0-M1-RC17 Modified: maven/components/branches/maven-2.1.0-M1-RC/apache-maven/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-manager/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-test/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-artifact/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-core/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-error-diagnostics/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-model/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-monitor/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-plugin-api/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-plugin-descriptor/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-plugin-parameter-documenter/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-plugin-registry/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-profile/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-project/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-reporting/maven-reporting-api/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-reporting/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-repository-metadata/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-script/maven-script-ant/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-script/maven-script-beanshell/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-script/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-settings/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-toolchain/pom.xml maven/components/branches/maven-2.1.0-M1-RC/pom.xml Modified: maven/components/branches/maven-2.1.0-M1-RC/apache-maven/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-M1-RC/apache-maven/pom.xml?rev=693659&r1=693658&r2=693659&view=diff == --- maven/components/branches/maven-2.1.0-M1-RC/apache-maven/pom.xml (original) +++ maven/components/branches/maven-2.1.0-M1-RC/apache-maven/pom.xml Tue Sep 9 16:48:57 2008 @@ -4,7 +4,7 @@ maven org.apache.maven -2.1.0-M1-RC17-SNAPSHOT +2.1.0-M1-RC17 apache-maven Modified: maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-manager/pom.xml?rev=693659&r1=693658&r2=693659&view=diff == --- maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-manager/pom.xml (original) +++ maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-manager/pom.xml Tue Sep 9 16:48:57 2008 @@ -3,7 +3,7 @@ maven org.apache.maven -2.1.0-M1-RC17-SNAPSHOT +2.1.0-M1-RC17 4.0.0 maven-artifact-manager Modified: maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-test/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-test/pom.xml?rev=693659&r1=693658&r2=693659&view=diff == --- maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-test/pom.xml (original) +++ maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-test/pom.xml Tue Sep 9 16:48:57 2008 @@ -3,7 +3,7 @@ maven org.apache.maven -2.1.0-M1-RC17-SNAPSHOT +2.1.0-M1-RC17 4.0.0 maven-artifact-test Modified: maven/components/branches/maven-2.1.0-M1-RC/maven-artifact/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-M1-RC/maven-artifact/pom.xml?rev=693659&r1=693658&r2=693659&view=diff == --- maven/components/branches/maven-2.1.0-M1-RC/maven-artifact/pom.xml (original) +++ maven/components/branches/maven-2.1.0-M1-RC/maven-artifact/pom.xml Tue Sep 9 16:48:57 2008 @@ -3,7 +3,7 @@ maven org.apache.maven -2.1.0-M1-RC17-SNAPSHOT +2.1.0-M1-RC17 4.0.0 maven-artifact Modified: maven/components/branches/maven-2.1.0-M1-RC/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-M1-RC/maven-core/pom.xml?rev=693659&r1=693658&r2=693659&view=diff == --- maven/components/branches/maven-2.1.0-M1-RC/maven-core/pom.xml (original) +++ maven/components/branches/maven-2.1.0-M1-RC/maven-core/pom.xml Tue Sep 9 16:48:57 2008 @@ -4,7 +4,7 @@ maven org.apache.maven -2.1.0-M1-RC17-SNAPSHOT +2.1.0-M1-RC17
svn commit: r693660 - in /maven/components/tags/maven-2.1.0-M1-RC17: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-core/src/main/java/org/apache/maven
Author: jdcasey Date: Tue Sep 9 16:49:28 2008 New Revision: 693660 URL: http://svn.apache.org/viewvc?rev=693660&view=rev Log: [maven-release-plugin] copy for tag maven-2.1.0-M1-RC17 Added: maven/components/tags/maven-2.1.0-M1-RC17/ - copied from r693164, maven/components/branches/maven-2.1.0-M1-RC/ maven/components/tags/maven-2.1.0-M1-RC17/apache-maven/pom.xml - copied unchanged from r693659, maven/components/branches/maven-2.1.0-M1-RC/apache-maven/pom.xml maven/components/tags/maven-2.1.0-M1-RC17/maven-artifact-manager/pom.xml - copied unchanged from r693659, maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-manager/pom.xml maven/components/tags/maven-2.1.0-M1-RC17/maven-artifact-test/pom.xml - copied unchanged from r693659, maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-test/pom.xml maven/components/tags/maven-2.1.0-M1-RC17/maven-artifact/pom.xml - copied unchanged from r693659, maven/components/branches/maven-2.1.0-M1-RC/maven-artifact/pom.xml maven/components/tags/maven-2.1.0-M1-RC17/maven-core/pom.xml - copied unchanged from r693659, maven/components/branches/maven-2.1.0-M1-RC/maven-core/pom.xml maven/components/tags/maven-2.1.0-M1-RC17/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java - copied unchanged from r693654, maven/components/branches/maven-2.1.0-M1-RC/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java maven/components/tags/maven-2.1.0-M1-RC17/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java - copied unchanged from r693165, maven/components/branches/maven-2.1.0-M1-RC/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java maven/components/tags/maven-2.1.0-M1-RC17/maven-core/src/main/resources/META-INF/plexus/components.xml - copied unchanged from r693348, maven/components/branches/maven-2.1.0-M1-RC/maven-core/src/main/resources/META-INF/plexus/components.xml maven/components/tags/maven-2.1.0-M1-RC17/maven-error-diagnostics/pom.xml - copied unchanged from r693659, maven/components/branches/maven-2.1.0-M1-RC/maven-error-diagnostics/pom.xml maven/components/tags/maven-2.1.0-M1-RC17/maven-model/pom.xml - copied unchanged from r693659, maven/components/branches/maven-2.1.0-M1-RC/maven-model/pom.xml maven/components/tags/maven-2.1.0-M1-RC17/maven-monitor/pom.xml - copied unchanged from r693659, maven/components/branches/maven-2.1.0-M1-RC/maven-monitor/pom.xml maven/components/tags/maven-2.1.0-M1-RC17/maven-plugin-api/pom.xml - copied unchanged from r693659, maven/components/branches/maven-2.1.0-M1-RC/maven-plugin-api/pom.xml maven/components/tags/maven-2.1.0-M1-RC17/maven-plugin-descriptor/pom.xml - copied unchanged from r693659, maven/components/branches/maven-2.1.0-M1-RC/maven-plugin-descriptor/pom.xml maven/components/tags/maven-2.1.0-M1-RC17/maven-plugin-parameter-documenter/pom.xml - copied unchanged from r693659, maven/components/branches/maven-2.1.0-M1-RC/maven-plugin-parameter-documenter/pom.xml maven/components/tags/maven-2.1.0-M1-RC17/maven-plugin-registry/pom.xml - copied unchanged from r693659, maven/components/branches/maven-2.1.0-M1-RC/maven-plugin-registry/pom.xml maven/components/tags/maven-2.1.0-M1-RC17/maven-profile/pom.xml - copied unchanged from r693659, maven/components/branches/maven-2.1.0-M1-RC/maven-profile/pom.xml maven/components/tags/maven-2.1.0-M1-RC17/maven-project/pom.xml - copied unchanged from r693659, maven/components/branches/maven-2.1.0-M1-RC/maven-project/pom.xml maven/components/tags/maven-2.1.0-M1-RC17/maven-project/src/main/java/org/apache/maven/project/MavenProject.java - copied unchanged from r693165, maven/components/branches/maven-2.1.0-M1-RC/maven-project/src/main/java/org/apache/maven/project/MavenProject.java maven/components/tags/maven-2.1.0-M1-RC17/maven-project/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java - copied unchanged from r693339, maven/components/branches/maven-2.1.0-M1-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java maven/components/tags/maven-2.1.0-M1-RC17/maven-project/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java - copied unchanged from r693339, maven/components/branches/maven-2.1.0-M1-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java maven/components/tags/maven-2.1.0-M1-RC17/maven-reporting/maven-reporting-api/pom.xml - copied unchanged from r693659, maven/components/branches/maven-2.1.0-M1-RC/maven-reporting/maven-reporting-api/pom.xml maven/components/tags/maven-2.1.0-M1-RC17/maven-reporting/pom.xml - copied unchanged from r693659, maven/components/branches/maven-2.1.0-M1-RC
svn commit: r693661 - in /maven/components/branches/maven-2.1.0-M1-RC: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ m
Author: jdcasey Date: Tue Sep 9 16:49:43 2008 New Revision: 693661 URL: http://svn.apache.org/viewvc?rev=693661&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/components/branches/maven-2.1.0-M1-RC/apache-maven/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-manager/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-test/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-artifact/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-core/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-error-diagnostics/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-model/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-monitor/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-plugin-api/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-plugin-descriptor/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-plugin-parameter-documenter/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-plugin-registry/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-profile/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-project/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-reporting/maven-reporting-api/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-reporting/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-repository-metadata/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-script/maven-script-ant/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-script/maven-script-beanshell/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-script/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-settings/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-toolchain/pom.xml maven/components/branches/maven-2.1.0-M1-RC/pom.xml Modified: maven/components/branches/maven-2.1.0-M1-RC/apache-maven/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-M1-RC/apache-maven/pom.xml?rev=693661&r1=693660&r2=693661&view=diff == --- maven/components/branches/maven-2.1.0-M1-RC/apache-maven/pom.xml (original) +++ maven/components/branches/maven-2.1.0-M1-RC/apache-maven/pom.xml Tue Sep 9 16:49:43 2008 @@ -4,7 +4,7 @@ maven org.apache.maven -2.1.0-M1-RC17 +2.1.0-M1-RC18-SNAPSHOT apache-maven Modified: maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-manager/pom.xml?rev=693661&r1=693660&r2=693661&view=diff == --- maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-manager/pom.xml (original) +++ maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-manager/pom.xml Tue Sep 9 16:49:43 2008 @@ -3,7 +3,7 @@ maven org.apache.maven -2.1.0-M1-RC17 +2.1.0-M1-RC18-SNAPSHOT 4.0.0 maven-artifact-manager Modified: maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-test/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-test/pom.xml?rev=693661&r1=693660&r2=693661&view=diff == --- maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-test/pom.xml (original) +++ maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-test/pom.xml Tue Sep 9 16:49:43 2008 @@ -3,7 +3,7 @@ maven org.apache.maven -2.1.0-M1-RC17 +2.1.0-M1-RC18-SNAPSHOT 4.0.0 maven-artifact-test Modified: maven/components/branches/maven-2.1.0-M1-RC/maven-artifact/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-M1-RC/maven-artifact/pom.xml?rev=693661&r1=693660&r2=693661&view=diff == --- maven/components/branches/maven-2.1.0-M1-RC/maven-artifact/pom.xml (original) +++ maven/components/branches/maven-2.1.0-M1-RC/maven-artifact/pom.xml Tue Sep 9 16:49:43 2008 @@ -3,7 +3,7 @@ maven org.apache.maven -2.1.0-M1-RC17 +2.1.0-M1-RC18-SNAPSHOT 4.0.0 maven-artifact Modified: maven/components/branches/maven-2.1.0-M1-RC/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-M1-RC/maven-core/pom.xml?rev=693661&r1=693660&r2=693661&view=diff == --- maven/components/branches/maven-2.1.0-M1-RC/maven-core/pom.xml (original) +++ maven/components/branches/maven-2.1.0-M1-RC/maven-core/pom.xml Tue Sep 9 16:49:43 2008 @@ -4,7 +4,7 @@ maven org.apache.maven -2.1.0-M1-RC17 +2.1.0-M1-RC18-SNAPSHOT
svn commit: r693687 - /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Author: sisbell
Date: Tue Sep 9 19:34:59 2008
New Revision: 693687
URL: http://svn.apache.org/viewvc?rev=693687&view=rev
Log:
Fix: MavenProject.reportArtifacts was always returning null.
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=693687&r1=693686&r2=693687&view=diff
==
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Tue Sep 9 19:34:59 2008
@@ -1349,7 +1349,7 @@
public Set getReportArtifacts()
{
-Set pluginArtifacts = new HashSet();
+Set reportArtifacts = new HashSet();
List reports = getReportPlugins();
if ( reports != null )
{
@@ -1380,7 +1380,7 @@
if ( artifact != null )
{
-pluginArtifacts.add( artifact );
+reportArtifacts.add( artifact );
}
}
}
svn commit: r693690 - in /maven/sandbox/trunk/mercury: mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ mercury-util/src/main/java/org/apache/maven/mercury/util/ mercury-util/src/ma
Author: ogusakov
Date: Tue Sep 9 19:51:37 2008
New Revision: 693690
URL: http://svn.apache.org/viewvc?rev=693690&view=rev
Log:
added directory locking mechanism to be used in Local Repository
Added:
maven/sandbox/trunk/mercury/mercury-util/src/main/java/org/apache/maven/mercury/util/Messages.properties
- copied, changed from r693178,
maven/sandbox/trunk/mercury/mercury-util/src/main/resources/org/apache/maven/mercury/util/Messages.properties
Removed:
maven/sandbox/trunk/mercury/mercury-util/src/main/resources/org/apache/maven/mercury/util/Messages.properties
Modified:
maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java
maven/sandbox/trunk/mercury/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java
maven/sandbox/trunk/mercury/mercury-util/src/test/java/org/apache/maven/mercury/util/FileUtilTest.java
Modified:
maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java?rev=693690&r1=693689&r2=693690&view=diff
==
---
maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java
(original)
+++
maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java
Tue Sep 9 19:51:37 2008
@@ -104,7 +104,6 @@
artifactBinary = File.createTempFile( "test-repo-writer", "bin" );
FileUtil.writeRawData( artifactBinary, getClass().getResourceAsStream(
"/maven-core-2.0.9.jar" ) );
-
}
@@ -113,11 +112,6 @@
throws Exception
{
super.tearDown();
-//if( nexusForkedAppBooter != null )
-//{
-// nexusForkedAppBooter.stop();
-// nexusForkedAppBooter = null;
-//}
}
public void testWriteArtifact()
@@ -226,4 +220,10 @@
assertEquals( 7785, ap.length() );
}
+ public void testWriteContention()
+ throws Exception
+ {
+
+ }
+
}
Modified:
maven/sandbox/trunk/mercury/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java?rev=693690&r1=693689&r2=693690&view=diff
==
---
maven/sandbox/trunk/mercury/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java
(original)
+++
maven/sandbox/trunk/mercury/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java
Tue Sep 9 19:51:37 2008
@@ -5,11 +5,16 @@
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
+import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
+import java.io.RandomAccessFile;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileLock;
+import java.nio.channels.OverlappingFileLockException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
@@ -44,6 +49,7 @@
*/
public class FileUtil
{
+ public static final String LOCK_FILE = ".lock";
public static final String DEFAULT_CHARSET = "utf-8";
public static final intK = 1024;
public static final intDEFAULT_BUFFER_SIZE = 10 * K;
@@ -678,5 +684,57 @@
}
}
//---
+ /**
+ * try to acquire lock on specfied directory for millis millis
+ *
+ * @param dir directory to lock
+ * @param millis how long to wait for the lock before surrendering
+ * @param sleepFor how long to sleep between attempts
+ *
+ * @return obtained FileLock or null
+ * @throws IOException if there were problems obtaining the lock
+ */
+ public static boolean lockDir( String dir, long millis, long sleepFor )
+ throws IOException
+ {
+File df = new File(dir);
+if( !df.isDirectory() )
+ throw new IOException( _lang.getMessage( "file.is.not.directory", dir )
);
+
+File lock = new File(dir,LOCK_FILE);
+long start = System.currentTimeMillis();
+
+for(;;)
+ try
+ {
+if( lock.exists() )
+ throw new OverlappingFileLockException();
+FileOutputStream fos = new FileOutputStream( lock );
+fos.write( 32 );
+fos.flush();
+fos.close();
+
+return true;
+ }
+ catch( OverlappingFileLockException le )
+ {
+try { Thread.sleep( sleepFor ); } catch( InterruptedException e ){}
svn commit: r693707 - /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Author: sisbell
Date: Tue Sep 9 22:27:39 2008
New Revision: 693707
URL: http://svn.apache.org/viewvc?rev=693707&view=rev
Log:
Fix: MavenProject.pluginArtifacts now returns empty set, rather than null. This
was causing maven-project-info-reports-plugin to fail.
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=693707&r1=693706&r2=693707&view=diff
==
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Tue Sep 9 22:27:39 2008
@@ -1294,7 +1294,7 @@
{
return pluginArtifacts;
}
-Set pa = new HashSet();
+pluginArtifacts = new HashSet();
if ( artifactFactory != null )
{
List plugins = getBuildPlugins();
@@ -1320,16 +1320,15 @@
}
catch ( InvalidVersionSpecificationException e )
{
-return pa;
+return pluginArtifacts;
}
if ( artifact != null )
{
-pa.add( artifact );
+pluginArtifacts.add( artifact );
}
}
}
-pluginArtifacts = pa;
pluginArtifactMap = null;
return pluginArtifacts;
}
