svn commit: r1211335 - /maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars/verify.bsh
Author: dennisl
Date: Wed Dec 7 08:40:25 2011
New Revision: 1211335
URL: http://svn.apache.org/viewvc?rev=1211335view=rev
Log:
Fix the exception message if an excluded entry is included.
Modified:
maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars/verify.bsh
Modified: maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars/verify.bsh?rev=1211335r1=1211334r2=1211335view=diff
==
--- maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars/verify.bsh
(original)
+++ maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars/verify.bsh Wed Dec
7 08:40:25 2011
@@ -33,7 +33,7 @@ for ( String excluded : excludedEntries
System.out.println( Checking for excluded artifact + excluded );
if ( jar.getEntry( excluded ) != null )
{
-throw new IllegalStateException( Archive entry should be excluded:
+ included );
+throw new IllegalStateException( Archive entry should be excluded:
+ excluded );
}
}
svn commit: r1211346 - in /maven/surefire/trunk: surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/ surefire-providers/surefire-junit47/src/main/java/org/
Author: krosenvold
Date: Wed Dec 7 09:13:14 2011
New Revision: 1211346
URL: http://svn.apache.org/viewvc?rev=1211346view=rev
Log:
o Added some notes about junit threading to ConcurrentReporterManager
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test1.java
maven/surefire/trunk/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test3.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test1.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test1.java?rev=1211346r1=1211345r2=1211346view=diff
==
---
maven/surefire/trunk/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test1.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test1.java
Wed Dec 7 09:13:14 2011
@@ -7,6 +7,11 @@ import org.junit.Test;
public class Test1
{
+public Test1()
+{
+System.out.println( Thread.currentThread().getName() + Constructor
);
+}
+
static void sleep( int ms )
{
try
@@ -22,21 +27,21 @@ public class Test1
@Test
public void testSleep200()
{
-System.out.println( Test1.sleep200 started @ +
System.currentTimeMillis() );
+System.out.println( Thread.currentThread().getName() +
Test1.sleep200 started @ + System.currentTimeMillis() );
sleep( 200 );
}
@Test
public void testSleep400()
{
-System.out.println( Test1.sleep400 started @ +
System.currentTimeMillis() );
+System.out.println( Thread.currentThread().getName() +
Test1.sleep400 started @ + System.currentTimeMillis() );
sleep( 400 );
}
@Test
public void testSleep600()
{
-System.out.println( Test1.sleep600 started @ +
System.currentTimeMillis() );
+System.out.println( Thread.currentThread().getName() +
Test1.sleep600 started @ + System.currentTimeMillis() );
sleep( 600 );
}
@@ -44,6 +49,7 @@ public class Test1
public static void setUpBeforeClass()
throws Exception
{
+System.out.println( Thread.currentThread().getName() + beforeClass
sleep 175 + System.currentTimeMillis() );
Thread.sleep( 175 );
}
@@ -51,6 +57,7 @@ public class Test1
public static void tearDownAfterClass()
throws Exception
{
+System.out.println( Thread.currentThread().getName() + afterClass
sleep 175 + System.currentTimeMillis() );
Thread.sleep( 175 );
}
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test3.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test3.java?rev=1211346r1=1211345r2=1211346view=diff
==
---
maven/surefire/trunk/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test3.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test3.java
Wed Dec 7 09:13:14 2011
@@ -1,5 +1,7 @@
package runorder.parallel;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.junit.Test;
/**
@@ -32,4 +34,21 @@ public class Test3 {
System.out.println(Test3.sleep50 started @ +
System.currentTimeMillis());
Test1.sleep(50);
}
+
+@BeforeClass
+public static void setUpBeforeClass()
+throws Exception
+{
+System.out.println( Thread.currentThread().getName() + Test3
beforeClass sleep 175 + System.currentTimeMillis() );
+Thread.sleep( 175 );
+}
+
+@AfterClass
+public static void tearDownAfterClass()
+throws Exception
+{
+System.out.println( Thread.currentThread().getName() + Test3
afterClass sleep 175 + System.currentTimeMillis() );
+Thread.sleep( 175 );
+}
+
}
\ No newline at end of file
Modified:
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java?rev=1211346r1=1211345r2=1211346view=diff
svn commit: r1211419 - in /maven/plugins/trunk/maven-ear-plugin/src: it/packaging-excludes/ it/packaging-includes/ main/java/org/apache/maven/plugin/ear/
Author: dennisl
Date: Wed Dec 7 12:59:34 2011
New Revision: 1211419
URL: http://svn.apache.org/viewvc?rev=1211419view=rev
Log:
[MEAR-87] Allow exclusion of artifacts when building the ear file
Added:
maven/plugins/trunk/maven-ear-plugin/src/it/packaging-excludes/
maven/plugins/trunk/maven-ear-plugin/src/it/packaging-excludes/pom.xml
(with props)
maven/plugins/trunk/maven-ear-plugin/src/it/packaging-excludes/verify.bsh
(with props)
maven/plugins/trunk/maven-ear-plugin/src/it/packaging-includes/
maven/plugins/trunk/maven-ear-plugin/src/it/packaging-includes/pom.xml
(with props)
maven/plugins/trunk/maven-ear-plugin/src/it/packaging-includes/verify.bsh
(with props)
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
Added: maven/plugins/trunk/maven-ear-plugin/src/it/packaging-excludes/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/it/packaging-excludes/pom.xml?rev=1211419view=auto
==
--- maven/plugins/trunk/maven-ear-plugin/src/it/packaging-excludes/pom.xml
(added)
+++ maven/plugins/trunk/maven-ear-plugin/src/it/packaging-excludes/pom.xml Wed
Dec 7 12:59:34 2011
@@ -0,0 +1,53 @@
+?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
+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.
+--
+
+project
+ modelVersion4.0.0/modelVersion
+
+ groupIdorg.apache.maven.its.ear.packagingexcludes/groupId
+ artifactIdtest/artifactId
+ version1.0/version
+ packagingear/packaging
+
+ nameMaven EAR Plugin Integration Test :: packaging excludes/name
+ descriptionTest EAR generation using packaging excludes/description
+
+ dependencies
+dependency
+ groupIdcommons-lang/groupId
+ artifactIdcommons-lang/artifactId
+ version2.5/version
+/dependency
+ /dependencies
+
+ build
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-ear-plugin/artifactId
+version@project.version@/version
+configuration
+ packagingExcludescommons-lang-*.jar/packagingExcludes
+/configuration
+ /plugin
+/plugins
+ /build
+/project
Propchange:
maven/plugins/trunk/maven-ear-plugin/src/it/packaging-excludes/pom.xml
--
svn:eol-style = native
Added: maven/plugins/trunk/maven-ear-plugin/src/it/packaging-excludes/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/it/packaging-excludes/verify.bsh?rev=1211419view=auto
==
--- maven/plugins/trunk/maven-ear-plugin/src/it/packaging-excludes/verify.bsh
(added)
+++ maven/plugins/trunk/maven-ear-plugin/src/it/packaging-excludes/verify.bsh
Wed Dec 7 12:59:34 2011
@@ -0,0 +1,42 @@
+import java.io.*;
+import java.util.*;
+import java.util.jar.*;
+import java.util.regex.*;
+
+File jarFile = new File( basedir, target/test-1.0.ear );
+System.out.println( Checking for existence of + jarFile );
+if ( !jarFile.isFile() )
+{
+throw new IllegalStateException( Missing file: + jarFile );
+}
+
+JarFile jar = new JarFile( jarFile );
+
+String[] includedEntries = {
+META-INF/application.xml,
+META-INF/MANIFEST.MF
+};
+for ( String included : includedEntries )
+{
+System.out.println( Checking for included archive entry + included );
+if ( jar.getEntry( included ) == null )
+{
+throw new IllegalStateException( Missing archive entry: + included
);
+}
+}
+
+String[] excludedEntries = {
+commons-lang-2.5.jar
+};
+for ( String excluded : excludedEntries )
+{
+System.out.println( Checking for excluded artifact + excluded );
+if ( jar.getEntry( excluded ) != null )
+{
+throw new IllegalStateException( Archive entry should be excluded:
+ excluded );
+}
+}
+
+jar.close();
+
+return true;
Propchange:
maven/plugins/trunk/maven-ear-plugin/src/it/packaging-excludes/verify.bsh
--
svn:eol-style = native
Added: maven/plugins/trunk/maven-ear-plugin/src/it/packaging-includes/pom.xml
URL:
svn commit: r1211421 - /maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
Author: dennisl Date: Wed Dec 7 13:07:22 2011 New Revision: 1211421 URL: http://svn.apache.org/viewvc?rev=1211421view=rev Log: Fix typos in Javadoc. Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java?rev=1211421r1=1211420r2=1211421view=diff == --- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java (original) +++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java Wed Dec 7 13:07:22 2011 @@ -76,7 +76,7 @@ public class WarMojo /** * The comma separated list of tokens to exclude from the WAR before * packaging. This option may be used to implement the skinny WAR use - * case. Note the you can use the Java Regular Expressions engine to + * case. Note that you can use the Java Regular Expressions engine to * include and exclude specific pattern using the expression %regex[]. * Hint: read the about (?!Pattern). * @@ -88,7 +88,7 @@ public class WarMojo /** * The comma separated list of tokens to include in the WAR before * packaging. By default everything is included. This option may be used - * to implement the skinny WAR use case. Note the you can use the + * to implement the skinny WAR use case. Note that you can use the * Java Regular Expressions engine to include and exclude specific pattern * using the expression %regex[]. *
svn commit: r1211433 - /maven/plugins/trunk/maven-ear-plugin/src/site/site.xml
Author: dennisl Date: Wed Dec 7 13:35:59 2011 New Revision: 1211433 URL: http://svn.apache.org/viewvc?rev=1211433view=rev Log: Remove redundant name attribute. Modified: maven/plugins/trunk/maven-ear-plugin/src/site/site.xml Modified: maven/plugins/trunk/maven-ear-plugin/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/site/site.xml?rev=1211433r1=1211432r2=1211433view=diff == --- maven/plugins/trunk/maven-ear-plugin/src/site/site.xml (original) +++ maven/plugins/trunk/maven-ear-plugin/src/site/site.xml Wed Dec 7 13:35:59 2011 @@ -21,8 +21,7 @@ under the License. project xmlns=http://maven.apache.org/DECORATION/1.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation=http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd; - name=Maven Ear plugin + xsi:schemaLocation=http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd; body menu name=Overview item name=Introduction href=index.html/
svn commit: r1211434 - /maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
Author: dennisl
Date: Wed Dec 7 13:36:35 2011
New Revision: 1211434
URL: http://svn.apache.org/viewvc?rev=1211434view=rev
Log:
Minor tweaks to Javadoc.
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java?rev=1211434r1=1211433r2=1211434view=diff
==
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
Wed Dec 7 13:36:35 2011
@@ -94,7 +94,7 @@ public class EarMojo
private String earSourceExcludes;
/**
- * Specify that the ear sources should be filtered.
+ * Specify that the EAR sources should be filtered.
*
* @parameter default-value=false
* @since 2.3.2
@@ -119,8 +119,8 @@ public class EarMojo
private List nonFilteredFileExtensions;
/**
- * To escape interpolated value with windows path
- * c:\foo\bar will be replaced with c:\\foo\\bar
+ * To escape interpolated value with Windows path
+ * c:\foo\bar will be replaced with c:\\foo\\bar.
*
* @parameter expression=${maven.ear.escapedBackslashesInFilePath}
default-value=false
* @since 2.3.2
@@ -128,8 +128,8 @@ public class EarMojo
private boolean escapedBackslashesInFilePath;
/**
- * Expression preceded with the String won't be interpolated
- * \${foo} will be replaced with ${foo}
+ * Expression preceded with this String won't be interpolated
+ * \${foo} will be replaced with ${foo}.
*
* @parameter expression=${maven.ear.escapeString}
* @since 2.3.2
@@ -137,8 +137,8 @@ public class EarMojo
protected String escapeString;
/**
- * The location of the manifest file to be used within the ear file. If
- * not value if specified, the default location in the workDirectory is
+ * The location of the manifest file to be used within the EAR file. If
+ * no value if specified, the default location in the workDirectory is
* taken. If the file does not exist, a manifest will be generated
* automatically.
*
@@ -148,7 +148,7 @@ public class EarMojo
/**
* The location of a custom application.xml file to be used
- * within the ear file.
+ * within the EAR file.
*
* @parameter
*/
@@ -213,7 +213,7 @@ public class EarMojo
* The directory to get the resources from.
*
* @parameter
- * @deprecated please use earSourceDirectory instead
+ * @deprecated Please use earSourceDirectory instead.
*/
private File resourcesDir;
svn commit: r1211438 - in /maven/plugins/trunk/maven-ear-plugin: pom.xml src/site/apt/usage.apt.vm
Author: dennisl
Date: Wed Dec 7 13:47:35 2011
New Revision: 1211438
URL: http://svn.apache.org/viewvc?rev=1211438view=rev
Log:
Extract the version of Maven Archiver to a property and display it on the usage
page.
Modified:
maven/plugins/trunk/maven-ear-plugin/pom.xml
maven/plugins/trunk/maven-ear-plugin/src/site/apt/usage.apt.vm
Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/pom.xml?rev=1211438r1=1211437r2=1211438view=diff
==
--- maven/plugins/trunk/maven-ear-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/pom.xml Wed Dec 7 13:47:35 2011
@@ -53,6 +53,7 @@ under the License.
/issueManagement
properties
+mavenArchiverVersion2.4.1/mavenArchiverVersion
mavenVersion2.0.6/mavenVersion
/properties
@@ -80,7 +81,7 @@ under the License.
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-archiver/artifactId
- version2.4.1/version
+ version${mavenArchiverVersion}/version
/dependency
dependency
groupIdorg.codehaus.plexus/groupId
Modified: maven/plugins/trunk/maven-ear-plugin/src/site/apt/usage.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/site/apt/usage.apt.vm?rev=1211438r1=1211437r2=1211438view=diff
==
--- maven/plugins/trunk/maven-ear-plugin/src/site/apt/usage.apt.vm (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/site/apt/usage.apt.vm Wed Dec 7
13:47:35 2011
@@ -26,6 +26,9 @@
Usage
+ To handle archiving this version of Maven EAR Plugin uses
+ {{{http://maven.apache.org/shared/maven-archiver/index.html}Maven Archiver}}
${mavenArchiverVersion}.
+
* Introduction
The EAR Plugin allows to generate automatically the deployment descriptor,
e.g.
svn commit: r1211440 - in /maven/plugins/trunk/maven-ear-plugin: pom.xml src/site/apt/usage.apt.vm
Author: dennisl
Date: Wed Dec 7 13:51:01 2011
New Revision: 1211440
URL: http://svn.apache.org/viewvc?rev=1211440view=rev
Log:
Extract the version of Maven Filtering to a property and display it on the
usage page.
Modified:
maven/plugins/trunk/maven-ear-plugin/pom.xml
maven/plugins/trunk/maven-ear-plugin/src/site/apt/usage.apt.vm
Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/pom.xml?rev=1211440r1=1211439r2=1211440view=diff
==
--- maven/plugins/trunk/maven-ear-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/pom.xml Wed Dec 7 13:51:01 2011
@@ -54,6 +54,7 @@ under the License.
properties
mavenArchiverVersion2.4.1/mavenArchiverVersion
+mavenFilteringVersion1.0-beta-2/mavenFilteringVersion
mavenVersion2.0.6/mavenVersion
/properties
@@ -101,7 +102,7 @@ under the License.
dependency
groupIdorg.apache.maven.shared/groupId
artifactIdmaven-filtering/artifactId
- version1.0-beta-2/version
+ version${mavenFilteringVersion}/version
/dependency
dependency
groupIdorg.apache.maven.shared/groupId
Modified: maven/plugins/trunk/maven-ear-plugin/src/site/apt/usage.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/site/apt/usage.apt.vm?rev=1211440r1=1211439r2=1211440view=diff
==
--- maven/plugins/trunk/maven-ear-plugin/src/site/apt/usage.apt.vm (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/site/apt/usage.apt.vm Wed Dec 7
13:51:01 2011
@@ -29,6 +29,9 @@ Usage
To handle archiving this version of Maven EAR Plugin uses
{{{http://maven.apache.org/shared/maven-archiver/index.html}Maven Archiver}}
${mavenArchiverVersion}.
+ To handle filtering this version of Maven EAR Plugin uses
+ {{{http://maven.apache.org/shared/maven-filtering/index.html}Maven
Filtering}} ${mavenFilteringVersion}.
+
* Introduction
The EAR Plugin allows to generate automatically the deployment descriptor,
e.g.
svn commit: r1211459 - /maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/including-excluding-files-from-war.apt.vm
Author: dennisl
Date: Wed Dec 7 14:43:37 2011
New Revision: 1211459
URL: http://svn.apache.org/viewvc?rev=1211459view=rev
Log:
Put line breaks into the paragraphs.
Modified:
maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/including-excluding-files-from-war.apt.vm
Modified:
maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/including-excluding-files-from-war.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/including-excluding-files-from-war.apt.vm?rev=1211459r1=1211458r2=1211459view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/including-excluding-files-from-war.apt.vm
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/including-excluding-files-from-war.apt.vm
Wed Dec 7 14:43:37 2011
@@ -29,7 +29,11 @@
Including and Excluding Files From the WAR
- It is possible to include or exclude certain files from the WAR file, by
using the \packagingIncludes\ and \packagingExcludes\
configuration parameters. They each take a comma-separated list of Ant file set
patterns. You can use wildcards such as ** to indicate multiple
directories and * to indicate an optional part of a file or directory
name.
+ It is possible to include or exclude certain files from the WAR file, by
using
+ the \packagingIncludes\ and \packagingExcludes\ configuration
+ parameters. They each take a comma-separated list of Ant file set patterns.
+ You can use wildcards such as ** to indicate multiple directories and
+ * to indicate an optional part of a file or directory name.
Here is an example where we exclude all JAR files from WEB-INF/lib:
@@ -51,7 +55,12 @@ Including and Excluding Files From the W
/project
+-+
- Sometimes even such wildcards are not enough. In these cases you can use
regular expressions with the %regex[] syntax. Here is a real life use
case in which this is used. In this example we want to exclude any
commons-logging and log4j JARs, but we do not want to exclude the
log4j-over-slf4j JAR. So we want to exclude log4j-\version\.jar but
keep the log4j-over-slf4j-\version\.jar.
+ Sometimes even such wildcards are not enough. In these cases you can use
+ regular expressions with the %regex[] syntax. Here is a real life use
+ case in which this is used. In this example we want to exclude any
+ commons-logging and log4j JARs, but we do not want to exclude the
+ log4j-over-slf4j JAR. So we want to exclude log4j-\version\.jar but
+ keep the log4j-over-slf4j-\version\.jar.
+-+
project
@@ -79,4 +88,7 @@ Including and Excluding Files From the W
/project
+-+
- If you have more real life examples of using regular expressions, we'd like
to know about them. Please file an issue in {{{../issue-tracking.html}our issue
tracker}} with your configuration, so we can expand this page.
+ If you have more real life examples of using regular expressions, we'd like
to
+ know about them. Please file an issue in
+ {{{../issue-tracking.html}our issue tracker}} with your configuration, so we
+ can expand this page.
svn commit: r1211460 - in /maven/plugins/trunk/maven-war-plugin: pom.xml src/site/apt/usage.apt.vm
Author: dennisl
Date: Wed Dec 7 14:44:21 2011
New Revision: 1211460
URL: http://svn.apache.org/viewvc?rev=1211460view=rev
Log:
Extract the version of Maven Filtering to a property and display it on the
usage page.
Modified:
maven/plugins/trunk/maven-war-plugin/pom.xml
maven/plugins/trunk/maven-war-plugin/src/site/apt/usage.apt.vm
Modified: maven/plugins/trunk/maven-war-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=1211460r1=1211459r2=1211460view=diff
==
--- maven/plugins/trunk/maven-war-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/pom.xml Wed Dec 7 14:44:21 2011
@@ -51,8 +51,9 @@ under the License.
/issueManagement
properties
-mavenVersion2.0.6/mavenVersion
mavenArchiverVersion2.4.2/mavenArchiverVersion
+mavenFilteringVersion1.0-beta-2/mavenFilteringVersion
+mavenVersion2.0.6/mavenVersion
/properties
dependencies
@@ -143,7 +144,7 @@ under the License.
dependency
groupIdorg.apache.maven.shared/groupId
artifactIdmaven-filtering/artifactId
- version1.0-beta-2/version
+ version${mavenFilteringVersion}/version
/dependency
dependency
Modified: maven/plugins/trunk/maven-war-plugin/src/site/apt/usage.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/site/apt/usage.apt.vm?rev=1211460r1=1211459r2=1211460view=diff
==
--- maven/plugins/trunk/maven-war-plugin/src/site/apt/usage.apt.vm (original)
+++ maven/plugins/trunk/maven-war-plugin/src/site/apt/usage.apt.vm Wed Dec 7
14:44:21 2011
@@ -46,6 +46,9 @@ Usage
To handle archiving this version of Maven WAR Plugin uses
{{{http://maven.apache.org/shared/maven-archiver/index.html}Maven Archiver}}
${mavenArchiverVersion}.
+ To handle filtering this version of Maven WAR Plugin uses
+ {{{http://maven.apache.org/shared/maven-filtering/index.html}Maven
Filtering}} ${mavenFilteringVersion}.
+
*Using the package phase with the project package type as war /
invocation of the war:war goal
svn commit: r1211470 - /maven/maven-3/branches/maven-3.0.4-RCx/
Author: olamy Date: Wed Dec 7 15:18:10 2011 New Revision: 1211470 URL: http://svn.apache.org/viewvc?rev=1211470view=rev Log: create a release branch from 3.0.4-RC3 tag to not include r1210924 which was not part of RC3 build. Added: maven/maven-3/branches/maven-3.0.4-RCx/ (props changed) - copied from r1211469, maven/maven-3/tags/maven-3.0.4-RC3/ Propchange: maven/maven-3/branches/maven-3.0.4-RCx/ -- bugtraq:append = true Propchange: maven/maven-3/branches/maven-3.0.4-RCx/ -- bugtraq:label = Enter issue ID: Propchange: maven/maven-3/branches/maven-3.0.4-RCx/ -- bugtraq:message = Issue id: %BUGID% Propchange: maven/maven-3/branches/maven-3.0.4-RCx/ -- bugtraq:number = false Propchange: maven/maven-3/branches/maven-3.0.4-RCx/ -- bugtraq:url = http://jira.codehaus.org/browse/%BUGID% Propchange: maven/maven-3/branches/maven-3.0.4-RCx/ -- --- svn:ignore (added) +++ svn:ignore Wed Dec 7 15:18:10 2011 @@ -0,0 +1,16 @@ +release.properties +deleteme.version.properties +bootstrap +target +.classpath +.project +.settings +*.iml +*.iws +*.ipr +log.txt +dependencies.xml +.git +.gitignore +.idea +*.iml Propchange: maven/maven-3/branches/maven-3.0.4-RCx/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Dec 7 15:18:10 2011 @@ -0,0 +1,8 @@ +/maven/components/branches/MNG-3932-1:746145-746157 +/maven/components/branches/maven-2.0.10-RC:680477 +/maven/components/branches/maven-2.0.x:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631 +/maven/components/branches/maven-2.1.x:739385,741841,747468,747683,748815,749612,766523,768817 +/maven/components/branches/sisbell-plugin-manager:738973-739966 +/maven/components/sisbell-plugin-manager:738757-738972 +/maven/components/trunk:751453-767358,767708-768832 +/maven/maven-2/branches/maven-2.2.x:795521 Propchange: maven/maven-3/branches/maven-3.0.4-RCx/ -- svnmerge-integrated = /maven/components/branches/maven-2.0.x:1-496200
svn commit: r1211635 - in /maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src: main/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/ test/java/or
Author: olamy Date: Wed Dec 7 21:08:29 2011 New Revision: 1211635 URL: http://svn.apache.org/viewvc?rev=1211635view=rev Log: [SCM-649] Enhance SCM changelog model to hold more data about changes patch regarding git implementation. patch modified with using maven codestyle Submitted by Petr Kozelka. Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogConsumer.java maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogConsumerTest.java Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogConsumer.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogConsumer.java?rev=1211635r1=1211634r2=1211635view=diff == --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogConsumer.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogConsumer.java Wed Dec 7 21:08:29 2011 @@ -19,18 +19,21 @@ package org.apache.maven.scm.provider.gi * under the License. */ -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Locale; - import org.apache.maven.scm.ChangeFile; import org.apache.maven.scm.ChangeSet; +import org.apache.maven.scm.ScmFileStatus; import org.apache.maven.scm.log.ScmLogger; import org.apache.maven.scm.util.AbstractConsumer; import org.apache.regexp.RE; import org.apache.regexp.RESyntaxException; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.List; +import java.util.Locale; +import java.util.TimeZone; + /** * @author a href=mailto:strub...@yahoo.de;Mark Struberg/a * @author Olivier Lamy @@ -56,6 +59,26 @@ public class GitChangeLogConsumer private static final int STATUS_GET_AUTHOR = 2; /** + * State machine constant: expecting parent hash information + */ +private static final int STATUS_RAW_TREE = 21; + +/** + * State machine constant: expecting parent hash information + */ +private static final int STATUS_RAW_PARENT = 22; + +/** + * State machine constant: expecting author name, email and timestamp information + */ +private static final int STATUS_RAW_AUTHOR = 23; + +/** + * State machine constant: expecting committer name, email and timestamp information + */ +private static final int STATUS_RAW_COMMITTER = 24; + +/** * State machine constant: expecting date information */ private static final int STATUS_GET_DATE = 3; @@ -81,6 +104,26 @@ public class GitChangeLogConsumer private static final String AUTHOR_PATTERN = ^Author: (.*); /** + * The pattern used to match git tree hash lines (raw mode) + */ +private static final String RAW_TREE_PATTERN = ^tree ([:xdigit:]+); + +/** + * The pattern used to match git parent hash lines (raw mode) + */ +private static final String RAW_PARENT_PATTERN = ^parent ([:xdigit:]+); + +/** + * The pattern used to match git author lines (raw mode) + */ +private static final String RAW_AUTHOR_PATTERN = ^author (.+ .+) ([:digit:]+) (.*); + +/** + * The pattern used to match git author lines (raw mode) + */ +private static final String RAW_COMMITTER_PATTERN = ^committer (.+ .+) ([:digit:]+) (.*); + +/** * The pattern used to match git date lines */ private static final String DATE_PATTERN = ^Date:\\s*(.*); @@ -88,7 +131,8 @@ public class GitChangeLogConsumer /** * The pattern used to match git file lines */ -private static final String FILE_PATTERN = ^:\\d* \\d* [:xdigit:]*\\.* [:xdigit:]*\\.* ([:upper:])\\t(.*); +private static final String FILE_PATTERN = +^:\\d* \\d* [:xdigit:]*\\.* [:xdigit:]*\\.* ([:upper:])[:digit:]*\\t([^\\t]*)(\\t(.*))?; /** * Current status of the parser @@ -126,6 +170,26 @@ public class GitChangeLogConsumer private RE authorRegexp; /** + * The regular expression used to match tree hash lines in raw mode + */ +private RE rawTreeRegexp; + +/** + * The regular expression used to match parent hash lines in raw mode + */ +private RE rawParentRegexp; + +/** + * The regular expression used to match author lines
svn commit: r1211638 - in /maven/skins/trunk/maven-fluido-skin/src/it/mskins-15: ./ pom.xml src/ src/site/ src/site/site.xml
Author: rfscholte Date: Wed Dec 7 21:16:15 2011 New Revision: 1211638 URL: http://svn.apache.org/viewvc?rev=1211638view=rev Log: IT for MSKINS-15 Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-15/ maven/skins/trunk/maven-fluido-skin/src/it/mskins-15/pom.xml maven/skins/trunk/maven-fluido-skin/src/it/mskins-15/src/ maven/skins/trunk/maven-fluido-skin/src/it/mskins-15/src/site/ maven/skins/trunk/maven-fluido-skin/src/it/mskins-15/src/site/site.xml Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-15/pom.xml URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-15/pom.xml?rev=1211638view=auto == --- maven/skins/trunk/maven-fluido-skin/src/it/mskins-15/pom.xml (added) +++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-15/pom.xml Wed Dec 7 21:16:15 2011 @@ -0,0 +1,76 @@ +?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 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. +-- +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/xsd/maven-4.0.0.xsd; + modelVersion4.0.0/modelVersion + + groupIdorg.apache.maven.skins.its/groupId + artifactIdmskins-15/artifactId + version1.0-SNAPSHOT/version + + properties +skinNameApache Maven Fluido Skin/skinName +skinDescriptionThe Apache Maven Fluido Skin is an Apache Maven site skin +built on top of Twitter's bootstrap./skinDescription +skinGroupIdorg.apache.maven.skins/skinGroupId +skinArtifactIdmaven-fluido-skin/skinArtifactId +skinVersion1.1-SNAPSHOT/skinVersion + /properties + + build +plugins + plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-site-plugin/artifactId +version3.0/version + /plugin +/plugins + /build + + reporting +plugins + plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-project-info-reports-plugin/artifactId +version2.4/version +configuration + dependencyDetailsEnabledfalse/dependencyDetailsEnabled + dependencyLocationsEnabledfalse/dependencyLocationsEnabled +/configuration +reportSets + reportSet +reports + reportindex/report + reportsummary/report + reportlicense/report + reportproject-team/report + reportscm/report + reportissue-tracking/report + reportmailing-list/report + reportdependencies/report + reportcim/report + reportplugin-management/report + reportplugins/report +/reports + /reportSet +/reportSets + /plugin +/plugins + /reporting + +/project \ No newline at end of file Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-15/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-15/src/site/site.xml?rev=1211638view=auto == --- maven/skins/trunk/maven-fluido-skin/src/it/mskins-15/src/site/site.xml (added) +++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-15/src/site/site.xml Wed Dec 7 21:16:15 2011 @@ -0,0 +1,47 @@ +?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 + * 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
svn commit: r1211644 - /maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/hooks/
Author: olamy Date: Wed Dec 7 21:25:45 2011 New Revision: 1211644 URL: http://svn.apache.org/viewvc?rev=1211644view=rev Log: cleanup non needed hook samples Added: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/hooks/empty.txt (with props) Removed: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/hooks/applypatch-msg.sample maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/hooks/commit-msg.sample maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/hooks/post-commit.sample maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/hooks/post-receive.sample maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/hooks/post-update.sample maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/hooks/pre-applypatch.sample maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/hooks/pre-commit.sample maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/hooks/pre-rebase.sample maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/hooks/prepare-commit-msg.sample maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/hooks/update.sample Added: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/hooks/empty.txt URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/hooks/empty.txt?rev=1211644view=auto == --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/hooks/empty.txt (added) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/hooks/empty.txt Wed Dec 7 21:25:45 2011 @@ -0,0 +1 @@ +empty file Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/hooks/empty.txt -- svn:eol-style = native Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/git/info/.git/hooks/empty.txt -- svn:keywords = Author Date Id Revision
svn commit: r1211671 - /maven/skins/trunk/maven-fluido-skin/src/site/apt/index.apt.vm
Author: rfscholte
Date: Wed Dec 7 22:12:49 2011
New Revision: 1211671
URL: http://svn.apache.org/viewvc?rev=1211671view=rev
Log:
Add header per custom option
Describe visibility external links
Modified:
maven/skins/trunk/maven-fluido-skin/src/site/apt/index.apt.vm
Modified: maven/skins/trunk/maven-fluido-skin/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/site/apt/index.apt.vm?rev=1211671r1=1211670r2=1211671view=diff
==
--- maven/skins/trunk/maven-fluido-skin/src/site/apt/index.apt.vm (original)
+++ maven/skins/trunk/maven-fluido-skin/src/site/apt/index.apt.vm Wed Dec 7
22:12:49 2011
@@ -51,6 +51,8 @@ ${project.name}
/project
+-+
+** TopBar and/or sideBar
+
The skin supports different layouts, enabling/disabling the left sidebar menu
and the topbar menu.
Users have just play with flags in the custom/fluidoSkin element in
site.xml:
@@ -81,6 +83,8 @@ ${project.name}
Default skin setting is the option 1.
+** TopBarIcon
+
When users decide to enable the topbar, they can plug a small icon/logo there
(typically 108*20 px) just configuring
the custom/fluidoSkin/topBarIcon element in site.xml:
@@ -102,6 +106,8 @@ ${project.name}
/project
+-+
+** GoogleSearch
+
Users can optionally enable the Google Search for the generated site,
requirements are:
* the project/url property in pom.xml, unless the
custom/fluidoSkin/googleSearch/sitesearch property is set in the
site.xml:
@@ -140,6 +146,11 @@ ${project.name}
[]
+ External links are either rendered in the sidebar or the topbar. When both
sidebar and topbar are enabled,
+ they are rendered as dropdown in the topbar only.
+
+** SourceLineNumbers
+
Source code sections are enhanced by
{{{http://code.google.com/p/google-code-prettify/}Google Code Prettify}}, users
can
optionally enable line numbers rendering (disabled by default):
@@ -155,7 +166,7 @@ ${project.name}
/project
+-+
-Footers placeholders
+** Footers placeholders
Since #eval Velocity macro is not supported yet, the only placeholder
available in additional footers is @project.name@.
svn commit: r1211677 - /maven/plugins/trunk/maven-site-plugin/src/site/apt/maven-3.apt.vm
Author: hboutemy
Date: Wed Dec 7 22:22:25 2011
New Revision: 1211677
URL: http://svn.apache.org/viewvc?rev=1211677view=rev
Log:
[MSITE-621] fixed XML snipped that causes mvn clean to delete whole tree
Modified:
maven/plugins/trunk/maven-site-plugin/src/site/apt/maven-3.apt.vm
Modified: maven/plugins/trunk/maven-site-plugin/src/site/apt/maven-3.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/apt/maven-3.apt.vm?rev=1211677r1=1211676r2=1211677view=diff
==
--- maven/plugins/trunk/maven-site-plugin/src/site/apt/maven-3.apt.vm (original)
+++ maven/plugins/trunk/maven-site-plugin/src/site/apt/maven-3.apt.vm Wed Dec
7 22:22:25 2011
@@ -96,7 +96,7 @@ Using it with Maven 3
+-+
reporting
excludeDefaultstrue/excludeDefaults
-outputDirectory/outputDirectory
+outputDirectory\${project.build.directory}/site/outputDirectory
plugins
plugin
groupIdorg.apache.maven.plugins/groupId
svn commit: r1211689 - in /maven/core-integration-testing/trunk: core-it-suite/src/test/java/org/apache/maven/it/ core-it-suite/src/test/resources/mng-5206/ core-it-support/core-it-plugins/ core-it-su
Author: olamy
Date: Wed Dec 7 22:53:08 2011
New Revision: 1211689
URL: http://svn.apache.org/viewvc?rev=1211689view=rev
Log:
add integration test to ensure plexus lifecycle is honoured: Contextualizable,
Disposable
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5206PlexusLifecycleHonoured.java
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5206/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5206/pom.xml
(with props)
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/pom.xml
(with props)
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/src/
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/src/main/
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/src/main/java/
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/src/main/java/org/
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/src/main/java/org/apache/
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/src/main/java/org/apache/maven/
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/src/main/java/org/apache/maven/its/
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/src/main/java/org/apache/maven/its/plugins/
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/src/main/java/org/apache/maven/its/plugins/MojoWithPlexusLifecycle.java
(with props)
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/src/main/resources/
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/src/main/resources/template.vm
(with props)
Modified:
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/pom.xml
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5206PlexusLifecycleHonoured.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5206PlexusLifecycleHonoured.java?rev=1211689view=auto
==
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5206PlexusLifecycleHonoured.java
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5206PlexusLifecycleHonoured.java
Wed Dec 7 22:53:08 2011
@@ -0,0 +1,61 @@
+package org.apache.maven.it;
+
+/*
+ * 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.
+ */
+
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+import java.util.List;
+
+/**
+ * This is a test set for a
href=http://jira.codehaus.org/browse/MNG-5206;MNG-5206/a.
+ *
+ * @author Olivier Lamy
+ */
+public class MavenITmng5206PlexusLifecycleHonoured
+extends AbstractMavenIntegrationTestCase
+{
+
+public MavenITmng5206PlexusLifecycleHonoured()
+{
+super( [2.0.7,) );
+}
+
+/**
+ * Verify that plexus lifecycle phases are honoured: contextualize,
configure, dispose
+ */
+public void testit()
+throws Exception
+{
+File testDir = ResourceExtractor.simpleExtractResources( getClass(),
/mng-5206 );
+
+Verifier verifier = newVerifier( testDir.getAbsolutePath() );
+verifier.setAutoclean( false );
+verifier.deleteDirectory( target );
+verifier.deleteArtifacts( org.apache.maven.its.mng5206 );
+verifier.executeGoal( validate );
+verifier.verifyErrorFreeLog();
+
svn commit: r1211691 - in /maven/core-integration-testing/trunk: core-it-suite/src/test/java/org/apache/maven/it/ core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/ core-it-support/core
Author: olamy Date: Wed Dec 7 22:53:46 2011 New Revision: 1211691 URL: http://svn.apache.org/viewvc?rev=1211691view=rev Log: enhance it test with testing Contextualizable call on the injected component Added: maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/src/main/java/org/apache/maven/its/plugins/plexuslifecycle/ maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/src/main/java/org/apache/maven/its/plugins/plexuslifecycle/DefaultFakeComponent.java - copied, changed from r1211689, maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/src/main/java/org/apache/maven/its/plugins/MojoWithPlexusLifecycle.java maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/src/main/java/org/apache/maven/its/plugins/plexuslifecycle/FakeComponent.java (with props) maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/src/main/java/org/apache/maven/its/plugins/plexuslifecycle/MojoWithPlexusLifecycle.java (contents, props changed) - copied, changed from r1211689, maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/src/main/java/org/apache/maven/its/plugins/MojoWithPlexusLifecycle.java Removed: maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/src/main/java/org/apache/maven/its/plugins/MojoWithPlexusLifecycle.java Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5206PlexusLifecycleHonoured.java maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/pom.xml Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5206PlexusLifecycleHonoured.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5206PlexusLifecycleHonoured.java?rev=1211691r1=1211690r2=1211691view=diff == --- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5206PlexusLifecycleHonoured.java (original) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5206PlexusLifecycleHonoured.java Wed Dec 7 22:53:46 2011 @@ -54,8 +54,11 @@ public class MavenITmng5206PlexusLifecyc verifier.verifyErrorFreeLog(); verifier.resetStreams(); -verifier.verifyTextInLog( MojoWithPlexusLifecycle :: dispose ); verifier.verifyTextInLog( MojoWithPlexusLifecycle :: contextualize ); +verifier.verifyTextInLog( DefaultFakeComponent :: contextualize ); +verifier.verifyTextInLog( MojoWithPlexusLifecycle :: dispose ); +// olamy dispose on injected component is not called +//verifier.verifyTextInLog( DefaultFakeComponent :: dispose ); } } Modified: maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/pom.xml?rev=1211691r1=1211690r2=1211691view=diff == --- maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/pom.xml (original) +++ maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/pom.xml Wed Dec 7 22:53:46 2011 @@ -47,4 +47,23 @@ under the License. version1.0-alpha-9-stable-1/version /dependency /dependencies + + build +plugins + plugin +groupIdorg.codehaus.plexus/groupId +artifactIdplexus-maven-plugin/artifactId +version1.3.8/version +executions + execution +idcreate-component-descriptor/id +phasegenerate-resources/phase +goals + goaldescriptor/goal +/goals + /execution +/executions + /plugin +/plugins + /build /project Copied: maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/src/main/java/org/apache/maven/its/plugins/plexuslifecycle/DefaultFakeComponent.java (from r1211689, maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/src/main/java/org/apache/maven/its/plugins/MojoWithPlexusLifecycle.java) URL:
svn commit: r1211692 - /maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
Author: olamy
Date: Wed Dec 7 22:55:08 2011
New Revision: 1211692
URL: http://svn.apache.org/viewvc?rev=1211692view=rev
Log:
[MNG-5206] plexus container never disposed
Submitted by Stuart McCulloch.
Modified:
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
Modified:
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java?rev=1211692r1=1211691r2=1211692view=diff
==
---
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
(original)
+++
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
Wed Dec 7 22:55:08 2011
@@ -180,6 +180,7 @@ public class MavenCli
// TODO: need to externalize CliRequest
public int doMain( CliRequest cliRequest )
{
+PlexusContainer localContainer = this.container;
try
{
initialize( cliRequest );
@@ -188,7 +189,7 @@ public class MavenCli
logging( cliRequest );
version( cliRequest );
properties( cliRequest );
-container( cliRequest );
+localContainer = container( cliRequest );
commands( cliRequest );
settings( cliRequest );
populateRequest( cliRequest );
@@ -218,6 +219,10 @@ public class MavenCli
}
finally
{
+if ( localContainer != this.container )
+{
+localContainer.dispose();
+}
if ( cliRequest.fileStream != null )
{
cliRequest.fileStream.close();
@@ -353,7 +358,7 @@ public class MavenCli
populateProperties( cliRequest.commandLine,
cliRequest.systemProperties, cliRequest.userProperties );
}
-private void container( CliRequest cliRequest )
+private PlexusContainer container( CliRequest cliRequest )
throws Exception
{
if ( cliRequest.classWorld == null )
@@ -414,6 +419,8 @@ public class MavenCli
settingsBuilder = container.lookup( SettingsBuilder.class );
dispatcher = (DefaultSecDispatcher) container.lookup(
SecDispatcher.class, maven );
+
+return container;
}
private PrintStreamLogger setupLogger( CliRequest cliRequest )
