svn commit: r939220 - in /maven/maven-3/trunk/maven-core/src: main/java/org/apache/maven/lifecycle/internal/ test/java/org/apache/maven/lifecycle/ test/java/org/apache/maven/lifecycle/internal/
Author: krosenvold
Date: Thu Apr 29 07:22:39 2010
New Revision: 939220
URL: http://svn.apache.org/viewvc?rev=939220view=rev
Log:
[MNG-4633] Changed to use nice clean countdownlatch instead of synchronized
booleans
Also updated phase locking to only lock when project being built changes phase
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilder.java
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/MavenExecutionPlanTest.java
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ExecutionPlanItemTest.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java?rev=939220r1=939219r2=939220view=diff
==
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java
Thu Apr 29 07:22:39 2010
@@ -19,7 +19,7 @@ import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
-import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.CountDownLatch;
/**
* Wraps individual MojoExecutions, containing information about completion
status and scheduling.
@@ -35,9 +35,7 @@ public class ExecutionPlanItem
private final Schedule schedule;
// Completeness just indicates that it has been run or failed
-private final AtomicBoolean complete = new AtomicBoolean( false );
-
-private final Object monitor = new Object();
+private final CountDownLatch done = new CountDownLatch( 1 );
public ExecutionPlanItem( MojoExecution mojoExecution, Schedule schedule )
{
@@ -57,47 +55,23 @@ public class ExecutionPlanItem
public void setComplete()
{
-boolean transitionSuccessful = ensureComplete();
-if ( !transitionSuccessful )
-{
-throw new IllegalStateException( Expected to be able to
setComplete node, but was complete already );
-}
-}
-
-public boolean ensureComplete()
-{
-boolean f = complete.compareAndSet( false, true );
-notifyListeners();
-return f;
+done.countDown();
}
-private void notifyListeners()
+public boolean isDone()
{
-synchronized ( monitor )
-{
-monitor.notifyAll();
-}
+return done.getCount() 1;
}
public void forceComplete()
{
-final boolean b = complete.getAndSet( true );
-if ( !b )
-{
-notifyListeners();
-} // Release anyone waiting for us
+setComplete();
}
public void waitUntilDone()
throws InterruptedException
{
-synchronized ( monitor )
-{
-while ( !complete.get() )
-{
-monitor.wait( 100 );
-}
-}
+done.await();
}
public Schedule getSchedule()
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilder.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilder.java?rev=939220r1=939219r2=939220view=diff
==
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilder.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilder.java
Thu Apr 29 07:22:39 2010
@@ -205,7 +205,7 @@ public class LifecycleWeaveBuilder
builtLogItem.setComplete();
ExecutionPlanItem nextPlanItem = planItems.hasNext() ?
planItems.next() : null;
-if ( nextPlanItem != null )
+if ( nextPlanItem != null
phaseRecorder.isDifferentPhase( nextPlanItem.getMojoExecution() ) )
{
final Schedule scheduleOfNext =
nextPlanItem.getSchedule();
@@ -215,12 +215,9 @@ public class LifecycleWeaveBuilder
projectBuild );
}
-if ( phaseRecorder.isDifferentPhase(
nextPlanItem.getMojoExecution() ) )
+for ( ArtifactLink dependencyLink :
dependencyLinks )
svn commit: r939485 - /maven/plugins/trunk/maven-changelog-plugin/src/site/fml/faq.fml
Author: dennisl Date: Thu Apr 29 21:24:50 2010 New Revision: 939485 URL: http://svn.apache.org/viewvc?rev=939485view=rev Log: Add a FAQ entry about SCM URL inheritance, related to MCHANGELOG-84. Modified: maven/plugins/trunk/maven-changelog-plugin/src/site/fml/faq.fml Modified: maven/plugins/trunk/maven-changelog-plugin/src/site/fml/faq.fml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/site/fml/faq.fml?rev=939485r1=939484r2=939485view=diff == --- maven/plugins/trunk/maven-changelog-plugin/src/site/fml/faq.fml (original) +++ maven/plugins/trunk/maven-changelog-plugin/src/site/fml/faq.fml Thu Apr 29 21:24:50 2010 @@ -180,5 +180,27 @@ mvn scm:changelog /ol /answer /faq +faq id=Why do the child modules of my multi module project have wrong SCM URLs + questionWhy do the child modules of my multi module project have wrong SCM URLs?/question + answer +p + The short answer is that they don't. This is usually a + misunderstanding of how the SCM URLs are inherited. +/p +p + If you only define an lt;scmgt; element in the parent POM, the + child modules will interit a value for their SCM URLs. The path to a + child directory, when using the aggregator, is emnot/em used when + constructing the SCM URLs. Only the artifactId is used. +/p +p + If you want to examine what your POM looks like, including the SCM + URLs, you can run this command: +source +mvn help:effective-pom +/source +/p + /answer +/faq /part /faqs \ No newline at end of file
svn commit: r939488 - in /maven/archetype/trunk/maven-archetype-bundles: maven-archetype-plugin-site/src/site/apt/ maven-archetype-plugin/src/site/apt/ maven-archetype-quickstart/src/site/apt/ maven-a
Author: hboutemy
Date: Thu Apr 29 21:37:09 2010
New Revision: 939488
URL: http://svn.apache.org/viewvc?rev=939488view=rev
Log:
improved archetypes site index with a usage section
Added:
maven/archetype/trunk/maven-archetype-bundles/maven-archetype-plugin-site/src/site/apt/index.apt.vm
- copied, changed from r939435,
maven/archetype/trunk/maven-archetype-bundles/maven-archetype-plugin-site/src/site/apt/index.apt
maven/archetype/trunk/maven-archetype-bundles/maven-archetype-plugin/src/site/apt/index.apt.vm
- copied, changed from r939435,
maven/archetype/trunk/maven-archetype-bundles/maven-archetype-plugin/src/site/apt/index.apt
maven/archetype/trunk/maven-archetype-bundles/maven-archetype-quickstart/src/site/apt/index.apt.vm
- copied, changed from r939435,
maven/archetype/trunk/maven-archetype-bundles/maven-archetype-quickstart/src/site/apt/index.apt
maven/archetype/trunk/maven-archetype-bundles/maven-archetype-site-simple/src/site/apt/index.apt.vm
- copied, changed from r939435,
maven/archetype/trunk/maven-archetype-bundles/maven-archetype-site-simple/src/site/apt/index.apt
maven/archetype/trunk/maven-archetype-bundles/maven-archetype-site/src/site/apt/index.apt.vm
- copied, changed from r939435,
maven/archetype/trunk/maven-archetype-bundles/maven-archetype-site/src/site/apt/index.apt
Removed:
maven/archetype/trunk/maven-archetype-bundles/maven-archetype-plugin-site/src/site/apt/index.apt
maven/archetype/trunk/maven-archetype-bundles/maven-archetype-plugin/src/site/apt/index.apt
maven/archetype/trunk/maven-archetype-bundles/maven-archetype-quickstart/src/site/apt/index.apt
maven/archetype/trunk/maven-archetype-bundles/maven-archetype-site-simple/src/site/apt/index.apt
maven/archetype/trunk/maven-archetype-bundles/maven-archetype-site/src/site/apt/index.apt
Copied:
maven/archetype/trunk/maven-archetype-bundles/maven-archetype-plugin-site/src/site/apt/index.apt.vm
(from r939435,
maven/archetype/trunk/maven-archetype-bundles/maven-archetype-plugin-site/src/site/apt/index.apt)
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-bundles/maven-archetype-plugin-site/src/site/apt/index.apt.vm?p2=maven/archetype/trunk/maven-archetype-bundles/maven-archetype-plugin-site/src/site/apt/index.apt.vmp1=maven/archetype/trunk/maven-archetype-bundles/maven-archetype-plugin-site/src/site/apt/index.aptr1=939435r2=939488rev=939488view=diff
==
---
maven/archetype/trunk/maven-archetype-bundles/maven-archetype-plugin-site/src/site/apt/index.apt
(original)
+++
maven/archetype/trunk/maven-archetype-bundles/maven-archetype-plugin-site/src/site/apt/index.apt.vm
Thu Apr 29 21:37:09 2010
@@ -23,4 +23,16 @@ project
| `-- usage.apt
`-- site.xml
-++
\ No newline at end of file
+++
+
+ This archetype can be layered upon an existing Maven project.
+
+* Usage
+
+ To create a new project or update an existing project from this archetype,
type:
+
+++
+
+mvn archetype:generate -DarchetypeGroupId=${project.groupId}
-DarchetypeArtifactId=${project.artifactId}
-DarchetypeVersion=${project.version}
+
+++
Copied:
maven/archetype/trunk/maven-archetype-bundles/maven-archetype-plugin/src/site/apt/index.apt.vm
(from r939435,
maven/archetype/trunk/maven-archetype-bundles/maven-archetype-plugin/src/site/apt/index.apt)
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-bundles/maven-archetype-plugin/src/site/apt/index.apt.vm?p2=maven/archetype/trunk/maven-archetype-bundles/maven-archetype-plugin/src/site/apt/index.apt.vmp1=maven/archetype/trunk/maven-archetype-bundles/maven-archetype-plugin/src/site/apt/index.aptr1=939435r2=939488rev=939488view=diff
==
---
maven/archetype/trunk/maven-archetype-bundles/maven-archetype-plugin/src/site/apt/index.apt
(original)
+++
maven/archetype/trunk/maven-archetype-bundles/maven-archetype-plugin/src/site/apt/index.apt.vm
Thu Apr 29 21:37:09 2010
@@ -19,4 +19,14 @@ project
`-- java
`-- MyMojo.java
-++
\ No newline at end of file
+++
+
+* Usage
+
+ To create a new project from this archetype, type:
+
+++
+
+mvn archetype:generate -DarchetypeGroupId=${project.groupId}
-DarchetypeArtifactId=${project.artifactId}
-DarchetypeVersion=${project.version}
+
+++
Copied:
maven/archetype/trunk/maven-archetype-bundles/maven-archetype-quickstart/src/site/apt/index.apt.vm
(from r939435,
maven/archetype/trunk/maven-archetype-bundles/maven-archetype-quickstart/src/site/apt/index.apt)
URL:
svn commit: r939504 - /maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv
Author: brianf Date: Thu Apr 29 22:37:36 2010 New Revision: 939504 URL: http://svn.apache.org/viewvc?rev=939504view=rev Log: MAVENUPLOAD-2754 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=939504r1=939503r2=939504view=diff == --- maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv (original) +++ maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv Thu Apr 29 22:37:36 2010 @@ -251,7 +251,6 @@ org.jlibrary,mavens...@web.sourceforge.net:/home/groups/j/jl/jlibrary/htdocs/m2repo,rsync_ssh,Roman Puchkovskiy,roman.puchkovs...@blandware.com,, org.jminix,ma...@maven.jminix.org:m2repo/releases,rsync_ssh,Laurent Bovet,lbo...@jminix.org,, org.jmonit,mavens...@web.sourceforge.net:/home/groups/j/jm/jmonit/htdocs/releases,rsync_ssh,Nicolas De Loof,nicolas.del...@gmail.com,, -org.jomc,mavens...@web.sourceforge.net:/home/groups/j/jo/jomc/htdocs/maven2/releases,rsync_ssh,The JOMC Project,jomc-notificati...@lists.sourceforge.net,, org.jsdoctoolkit,jvan...@people.apache.org:/home/nicolas/rsync-to-central,rsync_ssh,Nicolas De Loof,nico...@apache.org,, org.jsecurity,mavens...@web.sourceforge.net:/home/groups/j/js/jsecurity/htdocs/m2repo,rsync_ssh,Les Hazlewood,l...@hazlewood.com,, org.jvnet.hudson,rsync://maven.hudson-ci.org/hudson.maven,rsync,Kohsuke Kawaguchi,k...@kohsuke.org,,
