svn commit: r1228815 - in /maven/skins/trunk: maven-application-skin/pom.xml maven-classic-skin/pom.xml maven-default-skin/pom.xml maven-fluido-skin/pom.xml maven-skins/ maven-skins/pom.xml maven-styl
Author: dennisl Date: Sun Jan 8 10:06:58 2012 New Revision: 1228815 URL: http://svn.apache.org/viewvc?rev=1228815view=rev Log: Split maven-skins into two separate POMs: - one parent for all the skins called maven-skins, in a subfolder like we do for our plugins - one aggregator called maven-skins-aggregator, in the root of the project, to be used in a CI-environment Added: maven/skins/trunk/maven-skins/ (with props) maven/skins/trunk/maven-skins/pom.xml - copied, changed from r1228814, maven/skins/trunk/pom.xml Modified: maven/skins/trunk/maven-application-skin/pom.xml maven/skins/trunk/maven-classic-skin/pom.xml maven/skins/trunk/maven-default-skin/pom.xml maven/skins/trunk/maven-fluido-skin/pom.xml maven/skins/trunk/maven-stylus-skin/pom.xml maven/skins/trunk/pom.xml Modified: maven/skins/trunk/maven-application-skin/pom.xml URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-application-skin/pom.xml?rev=1228815r1=1228814r2=1228815view=diff == --- maven/skins/trunk/maven-application-skin/pom.xml (original) +++ maven/skins/trunk/maven-application-skin/pom.xml Sun Jan 8 10:06:58 2012 @@ -26,6 +26,7 @@ under the License. groupIdorg.apache.maven.skins/groupId artifactIdmaven-skins/artifactId version7-SNAPSHOT/version +relativePath../maven-skins/pom.xml/relativePath /parent artifactIdmaven-application-skin/artifactId Modified: maven/skins/trunk/maven-classic-skin/pom.xml URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-classic-skin/pom.xml?rev=1228815r1=1228814r2=1228815view=diff == --- maven/skins/trunk/maven-classic-skin/pom.xml (original) +++ maven/skins/trunk/maven-classic-skin/pom.xml Sun Jan 8 10:06:58 2012 @@ -26,6 +26,7 @@ under the License. groupIdorg.apache.maven.skins/groupId artifactIdmaven-skins/artifactId version7-SNAPSHOT/version +relativePath../maven-skins/pom.xml/relativePath /parent artifactIdmaven-classic-skin/artifactId Modified: maven/skins/trunk/maven-default-skin/pom.xml URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-default-skin/pom.xml?rev=1228815r1=1228814r2=1228815view=diff == --- maven/skins/trunk/maven-default-skin/pom.xml (original) +++ maven/skins/trunk/maven-default-skin/pom.xml Sun Jan 8 10:06:58 2012 @@ -26,6 +26,7 @@ under the License. groupIdorg.apache.maven.skins/groupId artifactIdmaven-skins/artifactId version7-SNAPSHOT/version +relativePath../maven-skins/pom.xml/relativePath /parent artifactIdmaven-default-skin/artifactId Modified: maven/skins/trunk/maven-fluido-skin/pom.xml URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/pom.xml?rev=1228815r1=1228814r2=1228815view=diff == --- maven/skins/trunk/maven-fluido-skin/pom.xml (original) +++ maven/skins/trunk/maven-fluido-skin/pom.xml Sun Jan 8 10:06:58 2012 @@ -22,6 +22,7 @@ groupIdorg.apache.maven.skins/groupId artifactIdmaven-skins/artifactId version7-SNAPSHOT/version +relativePath../maven-skins/pom.xml/relativePath /parent groupIdorg.apache.maven.skins/groupId Propchange: maven/skins/trunk/maven-skins/ -- --- svn:ignore (added) +++ svn:ignore Sun Jan 8 10:06:58 2012 @@ -0,0 +1 @@ +target Copied: maven/skins/trunk/maven-skins/pom.xml (from r1228814, maven/skins/trunk/pom.xml) URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-skins/pom.xml?p2=maven/skins/trunk/maven-skins/pom.xmlp1=maven/skins/trunk/pom.xmlr1=1228814r2=1228815rev=1228815view=diff == --- maven/skins/trunk/pom.xml (original) +++ maven/skins/trunk/maven-skins/pom.xml Sun Jan 8 10:06:58 2012 @@ -26,7 +26,7 @@ under the License. groupIdorg.apache.maven/groupId artifactIdmaven-parent/artifactId version21/version -relativePath../pom/maven/pom.xml/relativePath +relativePath../../pom/maven/pom.xml/relativePath /parent groupIdorg.apache.maven.skins/groupId @@ -38,18 +38,10 @@ under the License. descriptionMaven Skins/description urlhttp://maven.apache.org/skins//url - modules -modulemaven-application-skin/module -modulemaven-default-skin/module -modulemaven-classic-skin/module -modulemaven-stylus-skin/module -modulemaven-fluido-skin/module - /modules - scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/skins/trunk//connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/skins/trunk//developerConnection -urlhttp://svn.apache.org/viewvc/maven/skins/trunk//url +
svn commit: r1228818 - in /maven/skins/trunk/maven-fluido-skin/src/it: mskins-24/pom.xml mskins-24_topbar/pom.xml
Author: dennisl Date: Sun Jan 8 10:31:06 2012 New Revision: 1228818 URL: http://svn.apache.org/viewvc?rev=1228818view=rev Log: Fix URLs in ITs. Modified: maven/skins/trunk/maven-fluido-skin/src/it/mskins-24/pom.xml maven/skins/trunk/maven-fluido-skin/src/it/mskins-24_topbar/pom.xml Modified: maven/skins/trunk/maven-fluido-skin/src/it/mskins-24/pom.xml URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-24/pom.xml?rev=1228818r1=1228817r2=1228818view=diff == --- maven/skins/trunk/maven-fluido-skin/src/it/mskins-24/pom.xml (original) +++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-24/pom.xml Sun Jan 8 10:31:06 2012 @@ -30,7 +30,7 @@ packagingjar/packaging name@project.name@ IT, MSKINS-24/name - urlhttp://maven.apache.org/skins/@project.artifactId@/mskins-23//url + urlhttp://maven.apache.org/skins/@project.artifactId@/mskins-24//url properties skinName@project.name@/skinName Modified: maven/skins/trunk/maven-fluido-skin/src/it/mskins-24_topbar/pom.xml URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-24_topbar/pom.xml?rev=1228818r1=1228817r2=1228818view=diff == --- maven/skins/trunk/maven-fluido-skin/src/it/mskins-24_topbar/pom.xml (original) +++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-24_topbar/pom.xml Sun Jan 8 10:31:06 2012 @@ -30,7 +30,7 @@ packagingjar/packaging name@project.name@ IT, MSKINS-24/name - urlhttp://maven.apache.org/skins/@project.artifactId@/mskins-23//url + urlhttp://maven.apache.org/skins/@project.artifactId@/mskins-24_topbar//url properties skinName@project.name@/skinName
svn commit: r1228819 - in /maven/skins/trunk/maven-fluido-skin/src/it: mskins-13/pom.xml mskins-15/pom.xml
Author: dennisl Date: Sun Jan 8 10:33:38 2012 New Revision: 1228819 URL: http://svn.apache.org/viewvc?rev=1228819view=rev Log: Fix failing ITs by setting the properties for the skin artifact dynamically. These two failed for me locally because I didn't have version 1.1-SNAPSHOT of maven-fluido-skin installed in my local repository. Modified: maven/skins/trunk/maven-fluido-skin/src/it/mskins-13/pom.xml maven/skins/trunk/maven-fluido-skin/src/it/mskins-15/pom.xml Modified: maven/skins/trunk/maven-fluido-skin/src/it/mskins-13/pom.xml URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-13/pom.xml?rev=1228819r1=1228818r2=1228819view=diff == --- maven/skins/trunk/maven-fluido-skin/src/it/mskins-13/pom.xml (original) +++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-13/pom.xml Sun Jan 8 10:33:38 2012 @@ -27,12 +27,11 @@ urlhttp://maven.apache.org/skins/@project.artifactId@/mskins-13//url 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 +skinName@project.name@/skinName +skinDescription@project.description@/skinDescription +skinGroupId@project.groupId@/skinGroupId +skinArtifactId@project.artifactId@/skinArtifactId +skinVersion@project.version@/skinVersion /properties build Modified: 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=1228819r1=1228818r2=1228819view=diff == --- maven/skins/trunk/maven-fluido-skin/src/it/mskins-15/pom.xml (original) +++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-15/pom.xml Sun Jan 8 10:33:38 2012 @@ -27,12 +27,11 @@ urlhttp://maven.apache.org/skins/@project.artifactId@/mskins-15//url 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 +skinName@project.name@/skinName +skinDescription@project.description@/skinDescription +skinGroupId@project.groupId@/skinGroupId +skinArtifactId@project.artifactId@/skinArtifactId +skinVersion@project.version@/skinVersion /properties build
svn commit: r1228836 - in /maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear: AbstractEarModule.java AbstractEarMojo.java ApplicationXmlWriterContext.java EarModule.java E
Author: rfscholte
Date: Sun Jan 8 12:59:53 2012
New Revision: 1228836
URL: http://svn.apache.org/viewvc?rev=1228836view=rev
Log:
Add generics
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarModule.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriterContext.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModule.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarModule.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarModule.java?rev=1228836r1=1228835r2=1228836view=diff
==
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarModule.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarModule.java
Sun Jan 8 12:59:53 2012
@@ -97,7 +97,8 @@ public abstract class AbstractEarModule
this.earExecutionContext = earExecutionContext;
}
-public void resolveArtifact( Set artifacts )
+/** {@inheritDoc} */
+public void resolveArtifact( SetArtifact artifacts )
throws EarPluginException, MojoFailureException
{
// If the artifact is already set no need to resolve it
@@ -114,7 +115,8 @@ public abstract class AbstractEarModule
// Artifact has not been found
if ( artifact == null )
{
-Set candidates = ar.getArtifacts( groupId, artifactId,
getType() );
+@SuppressWarnings( unchecked )
+SetArtifact candidates = ar.getArtifacts( groupId,
artifactId, getType() );
if ( candidates.size() 1 )
{
throw new MojoFailureException( Artifact[ + this + ]
has + candidates.size()
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java?rev=1228836r1=1228835r2=1228836view=diff
==
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
Sun Jan 8 12:59:53 2012
@@ -19,6 +19,11 @@ package org.apache.maven.plugin.ear;
* under the License.
*/
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
import org.apache.maven.plugin.AbstractMojo;
@@ -30,12 +35,6 @@ import org.apache.maven.project.MavenPro
import org.codehaus.plexus.configuration.PlexusConfiguration;
import org.codehaus.plexus.configuration.PlexusConfigurationException;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
/**
* A base class for EAR-processing related tasks.
*
@@ -141,12 +140,13 @@ public abstract class AbstractEarMojo
*/
private String mainArtifactId = none;
-private List earModules;
+private ListEarModule earModules;
-private List allModules;
+private ListEarModule allModules;
private JbossConfiguration jbossConfiguration;
+@SuppressWarnings( unchecked )
public void execute()
throws MojoExecutionException, MojoFailureException
{
@@ -183,7 +183,7 @@ public abstract class AbstractEarMojo
typeMappingService );
getLog().debug( Resolving ear modules ... );
-allModules = new ArrayList();
+allModules = new ArrayListEarModule();
try
{
if ( modules != null modules.length 0 )
@@ -202,11 +202,9 @@ public abstract class AbstractEarMojo
}
// Let's add other modules
-Set artifacts = project.getArtifacts();
-for ( Iterator iter = artifacts.iterator(); iter.hasNext(); )
+SetArtifact artifacts = project.getArtifacts();
+for ( Artifact artifact : artifacts )
{
-Artifact artifact = (Artifact) iter.next();
-
// If the artifact's type is POM, ignore and continue
// since it's used for transitive deps only.
if ( pom.equals( artifact.getType() ) )
svn commit: r1228837 - /maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/
Author: rfscholte
Date: Sun Jan 8 13:19:38 2012
New Revision: 1228837
URL: http://svn.apache.org/viewvc?rev=1228837view=rev
Log:
Add more generics
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriter.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JarModule.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JbossAppXmlWriter.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JbossConfiguration.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/WebModule.java
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriter.java?rev=1228837r1=1228836r2=1228837view=diff
==
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriter.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriter.java
Sun Jan 8 13:19:38 2012
@@ -19,12 +19,11 @@ package org.apache.maven.plugin.ear;
* under the License.
*/
+import java.io.Writer;
+
import org.apache.maven.plugin.ear.util.JavaEEVersion;
import org.codehaus.plexus.util.xml.XMLWriter;
-import java.io.Writer;
-import java.util.Iterator;
-
/**
* An ttXmlWriter/tt based implementation used to generate an
* ttapplication.xml/tt file
@@ -102,18 +101,13 @@ final class ApplicationXmlWriter
}
// Do not change this unless you really know what you're doing :)
-
-final Iterator moduleIt = context.getEarModules().iterator();
-while ( moduleIt.hasNext() )
+for ( EarModule module : context.getEarModules() )
{
-EarModule module = (EarModule) moduleIt.next();
module.appendModule( writer, version.getVersion(),
generateModuleId );
}
-final Iterator securityRoleIt = context.getSecurityRoles().iterator();
-while ( securityRoleIt.hasNext() )
+for ( SecurityRole securityRole : context.getSecurityRoles() )
{
-SecurityRole securityRole = (SecurityRole) securityRoleIt.next();
securityRole.appendSecurityRole( writer );
}
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java?rev=1228837r1=1228836r2=1228837view=diff
==
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java
Sun Jan 8 13:19:38 2012
@@ -67,6 +67,7 @@ public final class EarModuleFactory
* @return an ear module for this artifact
* @throws UnknownArtifactTypeException if the artifact is not handled
*/
+@SuppressWarnings( deprecation )
public static EarModule newEarModule( Artifact artifact, JavaEEVersion
javaEEVersion, String defaultLibBundleDir,
Boolean includeInApplicationXml,
ArtifactTypeMappingService
typeMappingService )
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=1228837r1=1228836r2=1228837view=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
Sun Jan 8 13:19:38 2012
@@ -51,7 +51,6 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Iterator;
import java.util.List;
import java.util.zip.ZipException;
@@ -293,14 +292,12 @@ public class EarMojo
final JavaEEVersion javaEEVersion = JavaEEVersion.getJavaEEVersion(
version );
// Initializes unpack types
-List unpackTypesList = new
svn commit: r1228846 - in /maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear: output/ util/
Author: rfscholte
Date: Sun Jan 8 13:53:34 2012
New Revision: 1228846
URL: http://svn.apache.org/viewvc?rev=1228846view=rev
Log:
Add more generics
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/output/FileNameMappingFactory.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/ArtifactRepository.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/ArtifactTypeMappingService.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/EarMavenArchiver.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/JavaEEVersion.java
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/output/FileNameMappingFactory.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/output/FileNameMappingFactory.java?rev=1228846r1=1228845r2=1228846view=diff
==
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/output/FileNameMappingFactory.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/output/FileNameMappingFactory.java
Sun Jan 8 13:53:34 2012
@@ -74,7 +74,7 @@ public class FileNameMappingFactory
}
try
{
-final Class c = Class.forName( nameOrClass );
+final Class? c = Class.forName( nameOrClass );
return (FileNameMapping) c.newInstance();
}
catch ( ClassNotFoundException e )
@@ -98,4 +98,4 @@ public class FileNameMappingFactory
Specified class[ + nameOrClass + ] does not implement[ +
FileNameMapping.class.getName() + ] );
}
}
-}
+}
\ No newline at end of file
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/ArtifactRepository.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/ArtifactRepository.java?rev=1228846r1=1228845r2=1228846view=diff
==
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/ArtifactRepository.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/ArtifactRepository.java
Sun Jan 8 13:53:34 2012
@@ -19,12 +19,11 @@ package org.apache.maven.plugin.ear.util
* under the License.
*/
-import org.apache.maven.artifact.Artifact;
-
-import java.util.Iterator;
import java.util.Set;
import java.util.TreeSet;
+import org.apache.maven.artifact.Artifact;
+
/**
* An artifact repository used to resolve {@link
org.apache.maven.plugin.ear.EarModule}.
*
@@ -33,7 +32,7 @@ import java.util.TreeSet;
*/
public class ArtifactRepository
{
-private final Set artifacts;
+private final SetArtifact artifacts;
private final String mainArtifactId;
@@ -46,7 +45,7 @@ public class ArtifactRepository
* @param mainArtifactId the id to use for the main artifact
(no classifier)
* @param artifactTypeMappingService
*/
-public ArtifactRepository( Set artifacts, String mainArtifactId,
+public ArtifactRepository( SetArtifact artifacts, String mainArtifactId,
ArtifactTypeMappingService
artifactTypeMappingService )
{
this.artifacts = artifacts;
@@ -73,21 +72,19 @@ public class ArtifactRepository
*/
public Artifact getUniqueArtifact( String groupId, String artifactId,
String type, String classifier )
{
-final Set candidates = getArtifacts( groupId, artifactId, type );
+final SetArtifact candidates = getArtifacts( groupId, artifactId,
type );
if ( candidates.size() == 0 )
{
return null;
}
else if ( candidates.size() == 1 classifier == null )
{
-return (Artifact) candidates.iterator().next();
+return candidates.iterator().next();
}
else if ( classifier != null )
{
-final Iterator it = candidates.iterator();
-while ( it.hasNext() )
+for ( Artifact a : candidates )
{
-Artifact a = (Artifact) it.next();
if ( a.getClassifier() == null classifier.equals(
mainArtifactId ) )
{
return a;
@@ -131,14 +128,11 @@ public class ArtifactRepository
* @param type the type
* @return the artifacts or an empty set if no artifact were found
*/
-public Set getArtifacts( String groupId, String artifactId, String type )
+public SetArtifact getArtifacts( String groupId, String artifactId,
String type )
{
-
svn commit: r1228849 - in /maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear: AbstractEarTest.java it/AbstractEarPluginIT.java util/ArtifactTypeMappingServiceTest.java uti
Author: rfscholte
Date: Sun Jan 8 14:04:07 2012
New Revision: 1228849
URL: http://svn.apache.org/viewvc?rev=1228849view=rev
Log:
Generics for tests too
Modified:
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/AbstractEarTest.java
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/AbstractEarPluginIT.java
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/ArtifactTypeMappingServiceTest.java
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/EarMavenArchiverTest.java
Modified:
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/AbstractEarTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/AbstractEarTest.java?rev=1228849r1=1228848r2=1228849view=diff
==
---
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/AbstractEarTest.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/AbstractEarTest.java
Sun Jan 8 14:04:07 2012
@@ -43,24 +43,24 @@ public abstract class AbstractEarTest
}
-protected Set createArtifacts( String[] artifactsId )
+protected SetArtifact createArtifacts( String[] artifactsId )
{
return createArtifacts( artifactsId, null );
}
-protected Set createArtifacts( String[] artifactsId, String[] types )
+protected SetArtifact createArtifacts( String[] artifactsId, String[]
types )
{
return createArtifacts( artifactsId, types, null );
}
-protected Set createArtifacts( String[] artifactsId, String[] types,
String[] groupsId )
+protected SetArtifact createArtifacts( String[] artifactsId, String[]
types, String[] groupsId )
{
return createArtifacts( artifactsId, types, groupsId, null );
}
-protected Set createArtifacts( String[] artifactsId, String[] types,
String[] groupsId, String[] classifiers )
+protected SetArtifact createArtifacts( String[] artifactsId, String[]
types, String[] groupsId, String[] classifiers )
{
-Set result = new TreeSet();
+SetArtifact result = new TreeSetArtifact();
if ( artifactsId == null || artifactsId.length == 0 )
{
return result;
Modified:
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/AbstractEarPluginIT.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/AbstractEarPluginIT.java?rev=1228849r1=1228848r2=1228849view=diff
==
---
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/AbstractEarPluginIT.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/AbstractEarPluginIT.java
Sun Jan 8 14:04:07 2012
@@ -76,6 +76,7 @@ public abstract class AbstractEarPluginI
* @return the base directory of the project
* @throws Exception if an error occurred
*/
+@SuppressWarnings( unchecked )
protected File executeMojo( final String projectName, final Properties
properties, boolean expectNoError )
throws Exception
{
@@ -245,7 +246,7 @@ public abstract class AbstractEarPluginI
File dir = getEarDirectory( baseDir, projectName );
// Let's build the expected directories sort list
-final List expectedDirectories = new ArrayList();
+final ListFile expectedDirectories = new ArrayListFile();
for ( int i = 0; i artifactsDirectory.length; i++ )
{
if ( artifactsDirectory[i] )
@@ -254,7 +255,7 @@ public abstract class AbstractEarPluginI
}
}
-final List actualFiles = buildArchiveContentFiles( dir,
expectedDirectories );
+final ListFile actualFiles = buildArchiveContentFiles( dir,
expectedDirectories );
assertEquals( Artifacts mismatch + actualFiles,
artifactNames.length, actualFiles.size() );
for ( int i = 0; i artifactNames.length; i++ )
{
@@ -270,15 +271,15 @@ public abstract class AbstractEarPluginI
}
}
-protected List buildArchiveContentFiles( final File baseDir, final List
expectedDirectories )
+protected ListFile buildArchiveContentFiles( final File baseDir, final
ListFile expectedDirectories )
{
-final List result = new ArrayList();
+final ListFile result = new ArrayListFile();
addFiles( baseDir, result, expectedDirectories );
return result;
}
-private void addFiles( final File directory, final List files, final List
expectedDirectories )
+private void addFiles( final File directory, final ListFile files, final
svn commit: r1228874 - /maven/skins/tags/maven-skins-6/
Author: simonetripodi Date: Sun Jan 8 15:54:00 2012 New Revision: 1228874 URL: http://svn.apache.org/viewvc?rev=1228874view=rev Log: RC1 failed Removed: maven/skins/tags/maven-skins-6/
svn commit: r1228876 - /maven/skins/trunk/maven-skins/pom.xml
Author: simonetripodi
Date: Sun Jan 8 15:56:39 2012
New Revision: 1228876
URL: http://svn.apache.org/viewvc?rev=1228876view=rev
Log:
no needs to define the GPG plugin, enabled in apache-release profile
Modified:
maven/skins/trunk/maven-skins/pom.xml
Modified: maven/skins/trunk/maven-skins/pom.xml
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-skins/pom.xml?rev=1228876r1=1228875r2=1228876view=diff
==
--- maven/skins/trunk/maven-skins/pom.xml (original)
+++ maven/skins/trunk/maven-skins/pom.xml Sun Jan 8 15:56:39 2012
@@ -70,7 +70,7 @@ under the License.
artifactIdmaven-release-plugin/artifactId
configuration
tagBasehttps://svn.apache.org/repos/asf/maven/skins/tags/tagBase
-arguments-Prc,run-its,reporting/arguments
+arguments-Prc,apache-release,run-its,reporting/arguments
goalsdeploy site-deploy/goals
/configuration
/plugin
@@ -84,23 +84,6 @@ under the License.
properties
site.destination${project.artifactId}-${project.version}/site.destination
/properties
- build
-plugins
- plugin
-groupIdorg.apache.maven.plugins/groupId
-artifactIdmaven-gpg-plugin/artifactId
-executions
- execution
-idsign-artifacts/id
-phaseverify/phase
-goals
- goalsign/goal
-/goals
- /execution
-/executions
- /plugin
-/plugins
- /build
/profile
/profiles
svn commit: r1228877 - in /maven/skins/trunk: maven-application-skin/pom.xml maven-classic-skin/pom.xml maven-default-skin/pom.xml maven-fluido-skin/pom.xml maven-skins/pom.xml maven-stylus-skin/pom.x
Author: simonetripodi Date: Sun Jan 8 15:59:20 2012 New Revision: 1228877 URL: http://svn.apache.org/viewvc?rev=1228877view=rev Log: parent + skins versions rolled back, RC1 failed Modified: maven/skins/trunk/maven-application-skin/pom.xml maven/skins/trunk/maven-classic-skin/pom.xml maven/skins/trunk/maven-default-skin/pom.xml maven/skins/trunk/maven-fluido-skin/pom.xml maven/skins/trunk/maven-skins/pom.xml maven/skins/trunk/maven-stylus-skin/pom.xml Modified: maven/skins/trunk/maven-application-skin/pom.xml URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-application-skin/pom.xml?rev=1228877r1=1228876r2=1228877view=diff == --- maven/skins/trunk/maven-application-skin/pom.xml (original) +++ maven/skins/trunk/maven-application-skin/pom.xml Sun Jan 8 15:59:20 2012 @@ -25,12 +25,12 @@ under the License. parent groupIdorg.apache.maven.skins/groupId artifactIdmaven-skins/artifactId -version7-SNAPSHOT/version +version6-SNAPSHOT/version relativePath../maven-skins/pom.xml/relativePath /parent artifactIdmaven-application-skin/artifactId - version1.1-SNAPSHOT/version + version1.0-SNAPSHOT/version nameMaven Application Skin/name descriptionMaven Application Skin/description Modified: maven/skins/trunk/maven-classic-skin/pom.xml URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-classic-skin/pom.xml?rev=1228877r1=1228876r2=1228877view=diff == --- maven/skins/trunk/maven-classic-skin/pom.xml (original) +++ maven/skins/trunk/maven-classic-skin/pom.xml Sun Jan 8 15:59:20 2012 @@ -25,12 +25,12 @@ under the License. parent groupIdorg.apache.maven.skins/groupId artifactIdmaven-skins/artifactId -version7-SNAPSHOT/version +version6-SNAPSHOT/version relativePath../maven-skins/pom.xml/relativePath /parent artifactIdmaven-classic-skin/artifactId - version1.2-SNAPSHOT/version + version1.1-SNAPSHOT/version nameMaven Classic Skin/name descriptionMaven Classic Skin/description Modified: maven/skins/trunk/maven-default-skin/pom.xml URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-default-skin/pom.xml?rev=1228877r1=1228876r2=1228877view=diff == --- maven/skins/trunk/maven-default-skin/pom.xml (original) +++ maven/skins/trunk/maven-default-skin/pom.xml Sun Jan 8 15:59:20 2012 @@ -25,12 +25,12 @@ under the License. parent groupIdorg.apache.maven.skins/groupId artifactIdmaven-skins/artifactId -version7-SNAPSHOT/version +version6-SNAPSHOT/version relativePath../maven-skins/pom.xml/relativePath /parent artifactIdmaven-default-skin/artifactId - version1.2-SNAPSHOT/version + version1.1-SNAPSHOT/version nameMaven Default Skin/name descriptionMaven Default Skin/description Modified: maven/skins/trunk/maven-fluido-skin/pom.xml URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/pom.xml?rev=1228877r1=1228876r2=1228877view=diff == --- maven/skins/trunk/maven-fluido-skin/pom.xml (original) +++ maven/skins/trunk/maven-fluido-skin/pom.xml Sun Jan 8 15:59:20 2012 @@ -21,13 +21,13 @@ parent groupIdorg.apache.maven.skins/groupId artifactIdmaven-skins/artifactId -version7-SNAPSHOT/version +version6-SNAPSHOT/version relativePath../maven-skins/pom.xml/relativePath /parent groupIdorg.apache.maven.skins/groupId artifactIdmaven-fluido-skin/artifactId - version1.2-SNAPSHOT/version + version1.1-SNAPSHOT/version nameApache Maven Fluido Skin/name descriptionThe Apache Maven Fluido Skin is an Apache Maven site skin Modified: maven/skins/trunk/maven-skins/pom.xml URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-skins/pom.xml?rev=1228877r1=1228876r2=1228877view=diff == --- maven/skins/trunk/maven-skins/pom.xml (original) +++ maven/skins/trunk/maven-skins/pom.xml Sun Jan 8 15:59:20 2012 @@ -31,7 +31,7 @@ under the License. groupIdorg.apache.maven.skins/groupId artifactIdmaven-skins/artifactId - version7-SNAPSHOT/version + version6-SNAPSHOT/version packagingpom/packaging nameMaven Skins/name Modified: maven/skins/trunk/maven-stylus-skin/pom.xml URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-stylus-skin/pom.xml?rev=1228877r1=1228876r2=1228877view=diff == --- maven/skins/trunk/maven-stylus-skin/pom.xml (original) +++ maven/skins/trunk/maven-stylus-skin/pom.xml Sun Jan 8 15:59:20 2012 @@ -25,12 +25,12 @@ under the License. parent groupIdorg.apache.maven.skins/groupId artifactIdmaven-skins/artifactId -
svn commit: r1228887 - /maven/plugins/trunk/maven-ear-plugin/pom.xml
Author: rfscholte Date: Sun Jan 8 16:23:33 2012 New Revision: 1228887 URL: http://svn.apache.org/viewvc?rev=1228887view=rev Log: Update mavenArchiverVersion from 2.4.1 to 2.4.2 Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/pom.xml?rev=1228887r1=1228886r2=1228887view=diff == --- maven/plugins/trunk/maven-ear-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-ear-plugin/pom.xml Sun Jan 8 16:23:33 2012 @@ -53,7 +53,7 @@ under the License. /issueManagement properties -mavenArchiverVersion2.4.1/mavenArchiverVersion +mavenArchiverVersion2.4.2/mavenArchiverVersion mavenFilteringVersion1.0-beta-2/mavenFilteringVersion mavenVersion2.0.6/mavenVersion /properties
svn commit: r1228913 - in /maven/skins/trunk: ./ maven-skins/
Author: dennisl Date: Sun Jan 8 18:48:44 2012 New Revision: 1228913 URL: http://svn.apache.org/viewvc?rev=1228913view=rev Log: Ignore IDEA project files. Modified: maven/skins/trunk/ (props changed) maven/skins/trunk/maven-skins/ (props changed) Propchange: maven/skins/trunk/ -- --- svn:ignore (original) +++ svn:ignore Sun Jan 8 18:48:44 2012 @@ -1,5 +1,7 @@ target *.iml +*.ipr +*.iws .classpath .project .settings Propchange: maven/skins/trunk/maven-skins/ -- --- svn:ignore (original) +++ svn:ignore Sun Jan 8 18:48:44 2012 @@ -1 +1,2 @@ target +*.iml
svn commit: r1228915 - in /maven/skins/trunk: maven-application-skin/pom.xml maven-classic-skin/pom.xml maven-default-skin/pom.xml maven-fluido-skin/pom.xml
Author: dennisl
Date: Sun Jan 8 18:54:17 2012
New Revision: 1228915
URL: http://svn.apache.org/viewvc?rev=1228915view=rev
Log:
Now that the maven-skins parent is no longer in the parent directory, we need
to specify SCM URLs for all the skins. The default values, that is used if we
don't specify these URLs, are wrong.
Modified:
maven/skins/trunk/maven-application-skin/pom.xml
maven/skins/trunk/maven-classic-skin/pom.xml
maven/skins/trunk/maven-default-skin/pom.xml
maven/skins/trunk/maven-fluido-skin/pom.xml
Modified: maven/skins/trunk/maven-application-skin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-application-skin/pom.xml?rev=1228915r1=1228914r2=1228915view=diff
==
--- maven/skins/trunk/maven-application-skin/pom.xml (original)
+++ maven/skins/trunk/maven-application-skin/pom.xml Sun Jan 8 18:54:17 2012
@@ -36,6 +36,11 @@ under the License.
descriptionMaven Application Skin/description
urlhttp://maven.apache.org/skins/${site.destination}/url
+ scm
+
connectionscm:svn:http://svn.apache.org/repos/asf/maven/skins/trunk/maven-application-skin//connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/skins/trunk/maven-application-skin//developerConnection
+
urlhttp://svn.apache.org/viewvc/maven/skins/trunk/maven-application-skin//url
+ /scm
issueManagement
systemjira/system
urlhttp://jira.codehaus.org/browse/MSKINS/component/12531/url
Modified: maven/skins/trunk/maven-classic-skin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-classic-skin/pom.xml?rev=1228915r1=1228914r2=1228915view=diff
==
--- maven/skins/trunk/maven-classic-skin/pom.xml (original)
+++ maven/skins/trunk/maven-classic-skin/pom.xml Sun Jan 8 18:54:17 2012
@@ -36,6 +36,11 @@ under the License.
descriptionMaven Classic Skin/description
urlhttp://maven.apache.org/skins/${site.destination}/url
+ scm
+
connectionscm:svn:http://svn.apache.org/repos/asf/maven/skins/trunk/maven-classic-skin//connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/skins/trunk/maven-classic-skin//developerConnection
+
urlhttp://svn.apache.org/viewvc/maven/skins/trunk/maven-classic-skin//url
+ /scm
issueManagement
systemjira/system
urlhttp://jira.codehaus.org/browse/MSKINS/component/12532/url
Modified: maven/skins/trunk/maven-default-skin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-default-skin/pom.xml?rev=1228915r1=1228914r2=1228915view=diff
==
--- maven/skins/trunk/maven-default-skin/pom.xml (original)
+++ maven/skins/trunk/maven-default-skin/pom.xml Sun Jan 8 18:54:17 2012
@@ -36,6 +36,11 @@ under the License.
descriptionMaven Default Skin/description
urlhttp://maven.apache.org/skins/${site.destination}/url
+ scm
+
connectionscm:svn:http://svn.apache.org/repos/asf/maven/skins/trunk/maven-default-skin//connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/skins/trunk/maven-default-skin//developerConnection
+
urlhttp://svn.apache.org/viewvc/maven/skins/trunk/maven-default-skin//url
+ /scm
issueManagement
systemjira/system
urlhttp://jira.codehaus.org/browse/MSKINS/component/12533/url
Modified: maven/skins/trunk/maven-fluido-skin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/pom.xml?rev=1228915r1=1228914r2=1228915view=diff
==
--- maven/skins/trunk/maven-fluido-skin/pom.xml (original)
+++ maven/skins/trunk/maven-fluido-skin/pom.xml Sun Jan 8 18:54:17 2012
@@ -35,6 +35,11 @@
urlhttp://maven.apache.org/skins/${site.destination}/url
inceptionYear2011/inceptionYear
+ scm
+
connectionscm:svn:http://svn.apache.org/repos/asf/maven/skins/trunk/maven-fluido-skin//connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/skins/trunk/maven-fluido-skin//developerConnection
+
urlhttp://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin//url
+ /scm
issueManagement
systemjira/system
urlhttp://jira.codehaus.org/browse/MSKINS/component/15253/url
svn commit: r1228917 - /maven/plugins/trunk/maven-ear-plugin/pom.xml
Author: rfscholte
Date: Sun Jan 8 18:56:15 2012
New Revision: 1228917
URL: http://svn.apache.org/viewvc?rev=1228917view=rev
Log:
Cleanup m-invoker-p, already configured in maven-plugins parent, which caused a
duplicate invocation of this plugin
Modified:
maven/plugins/trunk/maven-ear-plugin/pom.xml
Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/pom.xml?rev=1228917r1=1228916r2=1228917view=diff
==
--- maven/plugins/trunk/maven-ear-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/pom.xml Sun Jan 8 18:56:15 2012
@@ -170,31 +170,13 @@ under the License.
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-invoker-plugin/artifactId
configuration
- debugtrue/debug
- projectsDirectorysrc/it/projectsDirectory
- cloneProjectsTo${project.build.directory}/it/cloneProjectsTo
- pomIncludes
-pomInclude*/pom.xml/pomInclude
- /pomIncludes
- preBuildHookScriptsetup/preBuildHookScript
- postBuildHookScriptverify/postBuildHookScript
!-- NOTE: Must be synced with the repo path used by
AbstractEarPluginIT --
localRepositoryPath${project.build.testOutputDirectory}/m2repo/localRepositoryPath
- settingsFilesrc/it/settings.xml/settingsFile
goals
goalclean/goal
goalpackage/goal
/goals
/configuration
-executions
- execution
-idintegration-test/id
-goals
- goalinstall/goal
- goalrun/goal
-/goals
- /execution
-/executions
/plugin
plugin
artifactIdmaven-surefire-plugin/artifactId
svn commit: r1228944 - in /maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader: ./ pom.xml src/ src/test/ src/test/java/ src/test/java/surefire812/ src/te
Author: krosenvold
Date: Sun Jan 8 20:32:53 2012
New Revision: 1228944
URL: http://svn.apache.org/viewvc?rev=1228944view=rev
Log:
[SUREFIRE-812] Added testcase, unable to reproduce
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/pom.xml
(with props)
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/test/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/test/java/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/test/java/surefire812/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/test/java/surefire812/TestLogging.java
(with props)
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/pom.xml?rev=1228944view=auto
==
---
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/pom.xml
(added)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/pom.xml
Sun Jan 8 20:32:53 2012
@@ -0,0 +1,47 @@
+project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
+ modelVersion4.0.0/modelVersion
+ groupIdorg.apache.maven.plugins.surefire/groupId
+ artifactIdlog4jClassloader/artifactId
+ namesurefire-812-log4j-classloader/name
+ version1.0.0-SNAPSHOT/version
+
+ build
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-compiler-plugin/artifactId
+configuration
+ source1.5/source
+ target1.5/target
+/configuration
+ /plugin
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-surefire-plugin/artifactId
+version${surefire.version}/version
+configuration
+ useManifestOnlyJarfalse/useManifestOnlyJar
+ forkModealways/forkMode
+ redirectTestOutputToFiletrue/redirectTestOutputToFile
+ systemPropertyVariables
+java.awt.headlesstrue/java.awt.headless
+ /systemPropertyVariables
+/configuration
+ /plugin
+/plugins
+ /build
+ dependencies
+dependency
+ groupIdjunit/groupId
+ artifactIdjunit/artifactId
+ version4.8.2/version
+ scopetest/scope
+/dependency
+dependency
+ groupIdlog4j/groupId
+ artifactIdlog4j/artifactId
+ version1.2.16/version
+/dependency
+ /dependencies
+/project
Propchange:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/pom.xml
--
svn:eol-style = native
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/test/java/surefire812/TestLogging.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/test/java/surefire812/TestLogging.java?rev=1228944view=auto
==
---
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/test/java/surefire812/TestLogging.java
(added)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/test/java/surefire812/TestLogging.java
Sun Jan 8 20:32:53 2012
@@ -0,0 +1,15 @@
+package surefire812;
+
+import org.apache.log4j.Logger;
+
+public class TestLogging
+{
+static {
+Logger.getLogger( TestLogging.class ).debug( fud);
+}
+
+public void testCanLogAMessage()
+{
+Logger.getLogger( TestLogging.class ).warn( hey you );
+}
+}
Propchange:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/test/java/surefire812/TestLogging.java
--
svn:eol-style = native
svn commit: r1228952 - in /maven/surefire/trunk/surefire-integration-tests/src/test: java/org/apache/maven/surefire/its/jiras/ resources/surefire-812-log4j-classloader/src/main/ resources/surefire-812
Author: krosenvold
Date: Sun Jan 8 20:49:30 2012
New Revision: 1228952
URL: http://svn.apache.org/viewvc?rev=1228952view=rev
Log:
[SUREFIRE-812] Reproduced, added IT. Already fixed for 2.12, probably
SUREFIRE-804
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire812Log4JClassLoaderIT.java
(with props)
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/main/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/main/resources/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/main/resources/log4j.properties
(with props)
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/test/java/surefire812/LoggingTest.java
(with props)
Removed:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/test/java/surefire812/TestLogging.java
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire812Log4JClassLoaderIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire812Log4JClassLoaderIT.java?rev=1228952view=auto
==
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire812Log4JClassLoaderIT.java
(added)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire812Log4JClassLoaderIT.java
Sun Jan 8 20:49:30 2012
@@ -0,0 +1,15 @@
+package org.apache.maven.surefire.its.jiras;
+
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class Surefire812Log4JClassLoaderIT
+extends SurefireIntegrationTestCase
+{
+public void testJunit3ParallelBuildResultCount()
+{
+executeErrorFreeTest( surefire-812-log4j-classloader, 1 );
+}
+}
Propchange:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire812Log4JClassLoaderIT.java
--
svn:eol-style = native
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/main/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/main/resources/log4j.properties?rev=1228952view=auto
==
---
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/main/resources/log4j.properties
(added)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/main/resources/log4j.properties
Sun Jan 8 20:49:30 2012
@@ -0,0 +1,24 @@
+
+log4j.rootLogger=debug, stdout, xml, R
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+
+log4j.appender.xml=org.apache.log4j.FileAppender
+log4j.appender.xml.file=example_xml.log
+log4j.appender.xml.append=false
+log4j.appender.xml.layout=org.apache.log4j.xml.XMLLayout
+
+# Pattern to output the caller's file name and line number.
+log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
+
+log4j.appender.R=org.apache.log4j.RollingFileAppender
+log4j.appender.R.File=example.log
+
+
+log4j.appender.R.MaxFileSize=100KB
+# Keep one backup file
+log4j.appender.R.MaxBackupIndex=1
+
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n
\ No newline at end of file
Propchange:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/main/resources/log4j.properties
--
svn:eol-style = native
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/test/java/surefire812/LoggingTest.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/test/java/surefire812/LoggingTest.java?rev=1228952view=auto
==
---
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/test/java/surefire812/LoggingTest.java
(added)
+++
svn commit: r1228958 - /maven/skins/trunk/maven-skins/pom.xml
Author: hboutemy
Date: Sun Jan 8 21:21:42 2012
New Revision: 1228958
URL: http://svn.apache.org/viewvc?rev=1228958view=rev
Log:
configured maven-site-plugin's stagingSiteURL (like done in maven-plugins
parent pom)
Modified:
maven/skins/trunk/maven-skins/pom.xml
Modified: maven/skins/trunk/maven-skins/pom.xml
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-skins/pom.xml?rev=1228958r1=1228957r2=1228958view=diff
==
--- maven/skins/trunk/maven-skins/pom.xml (original)
+++ maven/skins/trunk/maven-skins/pom.xml Sun Jan 8 21:21:42 2012
@@ -74,6 +74,12 @@ under the License.
goalsdeploy site-deploy/goals
/configuration
/plugin
+plugin
+ artifactIdmaven-site-plugin/artifactId
+ configuration
+
stagingSiteURLscp://people.apache.org/www/maven.apache.org/skins/${project.artifactId}-${project.version}/stagingSiteURL
+ /configuration
+/plugin
/plugins
/pluginManagement
/build
svn commit: r1228960 - in /maven/surefire/trunk: surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/ surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/
Author: krosenvold
Date: Sun Jan 8 21:24:39 2012
New Revision: 1228960
URL: http://svn.apache.org/viewvc?rev=1228960view=rev
Log:
[SUREFIRE-800] Fixed beforeclass/afterclass output when running classes=parallel
Added:
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ClassDemarcatingRunner.java
(with props)
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestFile.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire628ConsoleOutputBeforeAndAfterClassIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/pom.xml
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/src/test/java/surefire628/Test2.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputer.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestSet.java
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestFile.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestFile.java?rev=1228960r1=1228959r2=1228960view=diff
==
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestFile.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestFile.java
Sun Jan 8 21:24:39 2012
@@ -121,17 +121,18 @@ public class TestFile
return file.isFile();
}
-public void assertContainsText( String text )
+public TestFile assertContainsText( String text )
{
final ListString list = surefireVerifier.loadFile( file, false );
for ( String line : list )
{
if ( line.contains( text ) )
{
-return;
+return this;
}
}
Assert.fail( Did not find expected message in log );
+return null;
}
public URI toURI() {
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire628ConsoleOutputBeforeAndAfterClassIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire628ConsoleOutputBeforeAndAfterClassIT.java?rev=1228960r1=1228959r2=1228960view=diff
==
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire628ConsoleOutputBeforeAndAfterClassIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire628ConsoleOutputBeforeAndAfterClassIT.java
Sun Jan 8 21:24:39 2012
@@ -21,11 +21,12 @@ package org.apache.maven.surefire.its.ji
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.TestFile;
/**
* Asserts that console output always goes somewhere ;)
*
- * @author Kristian Rosenvold
+ * @author Kristian Rosenvold assertContainsText
*/
public class Surefire628ConsoleOutputBeforeAndAfterClassIT
extends SurefireIntegrationTestCase
@@ -34,14 +35,30 @@ public class Surefire628ConsoleOutputBef
public void testJunit3ParallelBuildResultCount()
{
OutputValidator validator =
unpack(surefire-628-consoleoutputbeforeandafterclass)
-.failNever().executeTest();
+.failNever().parallelMethods().executeTest();
validator.verifyTextInLog(628Test1);
validator.verifyTextInLog(Before628Test1);
validator.verifyTextInLog(After628Test1);
validator.verifyTextInLog(628Test2);
-validator.verifyTextInLog(Before628Test2);
-validator.verifyTextInLog(After628Test2);
+validator.verifyTextInLog(BeforeClass628Test2);
+validator.verifyTextInLog(AfterClass628Test2);
}
+
+
+public void testProperBeforeAndAfterClassCapture()
+{
+OutputValidator validator =
unpack(surefire-628-consoleoutputbeforeandafterclass)
+.failNever().redirectToFile( true
).parallelClasses().executeTest();
+
+final TestFile surefireReportsFile =
svn commit: r1228968 - /maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java
Author: rfscholte
Date: Sun Jan 8 22:02:52 2012
New Revision: 1228968
URL: http://svn.apache.org/viewvc?rev=1228968view=rev
Log:
Fix MSHARED-3: Infinite-loop in DefaultDownloader.download
Resolved by throwing a RuntimeException with the alternative, that's be best we
can do.
At least it's better than an infinitive loop without a clue
Modified:
maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java
Modified:
maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java?rev=1228968r1=1228967r2=1228968view=diff
==
---
maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java
(original)
+++
maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java
Sun Jan 8 22:02:52 2012
@@ -1,5 +1,8 @@
package org.apache.maven.shared.downloader;
+import java.io.File;
+import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -8,9 +11,6 @@ import org.apache.maven.artifact.resolve
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.artifact.versioning.VersionRange;
-import java.io.File;
-import java.util.List;
-
/**
* @author Jason van Zyl
* @plexus.component
@@ -28,7 +28,6 @@ public class DefaultDownloader
*/
private ArtifactFactory artifactFactory;
-// FIXME! This calls itself, and couldn't work even if it called the other
download method!
public File download( String groupId,
String artifactId,
String version,
@@ -37,7 +36,8 @@ public class DefaultDownloader
throws DownloadException, DownloadNotFoundException
{
-return download( groupId, artifactId, version, localRepository,
remoteRepositories );
+throw new RuntimeException( Unsupported method, instead use +
+
org.apache.maven.shared.downloader.DefaultDownloader.download( String, String,
String, ArtifactRepository, List ) );
}
public File download( String groupId,
