You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2011/12/12 23:22:51 UTC
svn commit: r1213471 - in
/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear:
./ util/
Author: dennisl
Date: Mon Dec 12 22:22:50 2011
New Revision: 1213471
URL: http://svn.apache.org/viewvc?rev=1213471&view=rev
Log:
Fix errors reported by Checkstyle.
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/ApplicationXmlWriter.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/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/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
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/InvalidJavaEEVersion.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/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=1213471&r1=1213470&r2=1213471&view=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 Mon Dec 12 22:22:50 2011
@@ -117,8 +117,8 @@ public abstract class AbstractEarModule
Set candidates = ar.getArtifacts( groupId, artifactId, getType() );
if ( candidates.size() > 1 )
{
- throw new MojoFailureException( "Artifact[" + this + "] has " + candidates.size() +
- " candidates, please provide a classifier." );
+ throw new MojoFailureException( "Artifact[" + this + "] has " + candidates.size()
+ + " candidates, please provide a classifier." );
}
else
{
@@ -371,7 +371,8 @@ public abstract class AbstractEarModule
return true;
}
- public String getLibDir() {
+ public String getLibDir()
+ {
return null;
}
}
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=1213471&r1=1213470&r2=1213471&view=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 Mon Dec 12 22:22:50 2011
@@ -217,8 +217,8 @@ public abstract class AbstractEarMojo
// Artifact is not yet registered and it has neither test, nor a
// provided scope, not is it optional
ScopeArtifactFilter filter = new ScopeArtifactFilter( Artifact.SCOPE_RUNTIME );
- if ( !isArtifactRegistered( artifact, allModules ) && !artifact.isOptional() &&
- filter.include( artifact ) )
+ if ( !isArtifactRegistered( artifact, allModules ) && !artifact.isOptional()
+ && filter.include( artifact ) )
{
EarModule module = EarModuleFactory.newEarModule( artifact, javaEEVersion, defaultLibBundleDir,
includeLibInApplicationXml, typeMappingService );
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=1213471&r1=1213470&r2=1213471&view=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 Mon Dec 12 22:22:50 2011
@@ -36,8 +36,8 @@ final class ApplicationXmlWriter
extends AbstractXmlWriter
{
public static final String DOCTYPE_1_3 =
- "application PUBLIC\n" + "\t\"-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN\"\n" +
- "\t\"http://java.sun.com/dtd/application_1_3.dtd\"";
+ "application PUBLIC\n" + "\t\"-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN\"\n"
+ + "\t\"http://java.sun.com/dtd/application_1_3.dtd\"";
private static final String APPLICATION_ELEMENT = "application";
Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriterContext.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriterContext.java?rev=1213471&r1=1213470&r2=1213471&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriterContext.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriterContext.java Mon Dec 12 22:22:50 2011
@@ -1,8 +1,5 @@
package org.apache.maven.plugin.ear;
-import java.io.File;
-import java.util.List;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -22,6 +19,9 @@ import java.util.List;
* under the License.
*/
+import java.io.File;
+import java.util.List;
+
/**
* A context for the {@link ApplicationXmlWriter}.
*
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=1213471&r1=1213470&r2=1213471&view=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 Mon Dec 12 22:22:50 2011
@@ -35,7 +35,7 @@ import java.util.List;
*/
public final class EarModuleFactory
{
- public final static List standardArtifactTypes;
+ public static final List standardArtifactTypes;
static
{
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=1213471&r1=1213470&r2=1213471&view=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 Mon Dec 12 22:22:50 2011
@@ -329,8 +329,8 @@ public class EarMojo
if ( !sourceFile.isFile() )
{
throw new MojoExecutionException(
- "Cannot copy a directory: " + sourceFile.getAbsolutePath() + "; Did you package/install " +
- module.getArtifact() + "?" );
+ "Cannot copy a directory: " + sourceFile.getAbsolutePath() + "; Did you package/install "
+ + module.getArtifact() + "?" );
}
if ( destinationFile.getCanonicalPath().equals( sourceFile.getCanonicalPath() ) )
@@ -342,9 +342,9 @@ public class EarMojo
// If the module is within the unpack list, make sure that no unpack wasn't forced (null or true)
// If the module is not in the unpack list, it should be true
- if ( ( unpackTypesList.contains( module.getType() ) &&
- ( module.shouldUnpack() == null || module.shouldUnpack().booleanValue() ) ) ||
- ( module.shouldUnpack() != null && module.shouldUnpack().booleanValue() ) )
+ if ( ( unpackTypesList.contains( module.getType() )
+ && ( module.shouldUnpack() == null || module.shouldUnpack().booleanValue() ) )
+ || ( module.shouldUnpack() != null && module.shouldUnpack().booleanValue() ) )
{
getLog().info( "Copying artifact [" + module + "] to [" + module.getUri() + "] (unpacked)" );
// Make sure that the destination is a directory to avoid plexus nasty stuff :)
@@ -371,8 +371,8 @@ public class EarMojo
else
{
getLog().debug(
- "Skipping artifact [" + module + "], as it is already up to date at [" + module.getUri() +
- "]" );
+ "Skipping artifact [" + module + "], as it is already up to date at [" + module.getUri()
+ + "]" );
}
}
}
@@ -692,7 +692,7 @@ public class EarMojo
File workDirectory;
// Handle the case that the destination might be a directory (project-038)
- if( original.isFile() )
+ if ( original.isFile() )
{
// Create a temporary work directory
workDirectory = new File( new File(
@@ -714,15 +714,17 @@ public class EarMojo
// Create a META-INF/MANIFEST.MF file if it doesn't exist (project-038)
File metaInfDirectory = new File( workDirectory, "META-INF" );
boolean newMetaInfCreated = metaInfDirectory.mkdirs();
- if( newMetaInfCreated )
+ if ( newMetaInfCreated )
{
- getLog().debug( "This project did not have a META-INF directory before, so a new directory was created." );
+ getLog().debug(
+ "This project did not have a META-INF directory before, so a new directory was created." );
}
File manifestFile = new File( metaInfDirectory, "MANIFEST.MF" );
boolean newManifestCreated = manifestFile.createNewFile();
- if( newManifestCreated )
+ if ( newManifestCreated )
{
- getLog().debug( "This project did not have a META-INF/MANIFEST.MF file before, so a new file was created." );
+ getLog().debug(
+ "This project did not have a META-INF/MANIFEST.MF file before, so a new file was created." );
}
// Read the manifest from disk
@@ -735,7 +737,8 @@ public class EarMojo
{
classPathElements.addAll( Arrays.asList( classPath.getValue()
.split( " " ) ) );
- } else
+ }
+ else
{
classPath = new Attribute( "Class-Path", "" );
mf.getMainSection().addConfiguredAttribute( classPath );
@@ -784,7 +787,7 @@ public class EarMojo
mf.write( pw );
pw.close();
- if( original.isFile() )
+ if ( original.isFile() )
{
// Pack up the archive again from the work directory
if ( !original.delete() )
Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JarModule.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JarModule.java?rev=1213471&r1=1213470&r2=1213471&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JarModule.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JarModule.java Mon Dec 12 22:22:50 2011
@@ -98,7 +98,8 @@ public class JarModule
}
}
- public boolean changeManifestClasspath() {
+ public boolean changeManifestClasspath()
+ {
return false;
}
}
Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JbossAppXmlWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JbossAppXmlWriter.java?rev=1213471&r1=1213470&r2=1213471&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JbossAppXmlWriter.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JbossAppXmlWriter.java Mon Dec 12 22:22:50 2011
@@ -37,17 +37,17 @@ final class JbossAppXmlWriter
extends AbstractXmlWriter
{
- public static final String DOCTYPE_3_2 = "jboss-app PUBLIC\n" + "\t\"-//JBoss//DTD J2EE Application 1.3//EN\"\n" +
- "\t\"http://www.jboss.org/j2ee/dtd/jboss-app_3_2.dtd\"";
+ public static final String DOCTYPE_3_2 = "jboss-app PUBLIC\n" + "\t\"-//JBoss//DTD J2EE Application 1.3//EN\"\n"
+ + "\t\"http://www.jboss.org/j2ee/dtd/jboss-app_3_2.dtd\"";
- public static final String DOCTYPE_4 = "jboss-app PUBLIC\n" + "\t\"-//JBoss//DTD J2EE Application 1.4//EN\"\n" +
- "\t\"http://www.jboss.org/j2ee/dtd/jboss-app_4_0.dtd\"";
+ public static final String DOCTYPE_4 = "jboss-app PUBLIC\n" + "\t\"-//JBoss//DTD J2EE Application 1.4//EN\"\n"
+ + "\t\"http://www.jboss.org/j2ee/dtd/jboss-app_4_0.dtd\"";
- public static final String DOCTYPE_4_2 = "jboss-app PUBLIC\n" + "\t\"-//JBoss//DTD J2EE Application 1.4//EN\"\n" +
- "\t\"http://www.jboss.org/j2ee/dtd/jboss-app_4_2.dtd\"";
+ public static final String DOCTYPE_4_2 = "jboss-app PUBLIC\n" + "\t\"-//JBoss//DTD J2EE Application 1.4//EN\"\n"
+ + "\t\"http://www.jboss.org/j2ee/dtd/jboss-app_4_2.dtd\"";
- public static final String DOCTYPE_5 = "jboss-app PUBLIC\n" + "\t\"-//JBoss//DTD Java EE Application 5.0//EN\"\n" +
- "\t\"http://www.jboss.org/j2ee/dtd/jboss-app_5_0.dtd\"";
+ public static final String DOCTYPE_5 = "jboss-app PUBLIC\n" + "\t\"-//JBoss//DTD Java EE Application 5.0//EN\"\n"
+ + "\t\"http://www.jboss.org/j2ee/dtd/jboss-app_5_0.dtd\"";
private static final String JBOSS_APP_ELEMENT = "jboss-app";
@@ -108,8 +108,8 @@ final class JbossAppXmlWriter
}
// classloader repository
- if ( jbossConfiguration.getLoaderRepository() != null ||
- jbossConfiguration.getLoaderRepositoryConfig() != null )
+ if ( jbossConfiguration.getLoaderRepository() != null
+ || jbossConfiguration.getLoaderRepositoryConfig() != null )
{
writer.startElement( JbossConfiguration.LOADER_REPOSITORY );
Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JbossConfiguration.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JbossConfiguration.java?rev=1213471&r1=1213470&r2=1213471&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JbossConfiguration.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JbossConfiguration.java Mon Dec 12 22:22:50 2011
@@ -1,7 +1,5 @@
package org.apache.maven.plugin.ear;
-import java.util.List;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,6 +19,7 @@ import java.util.List;
* under the License.
*/
+import java.util.List;
/**
* The JBoss specific configuration, used to generate the jboss-app.xml
Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/WebModule.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/WebModule.java?rev=1213471&r1=1213470&r2=1213471&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/WebModule.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/WebModule.java Mon Dec 12 22:22:50 2011
@@ -118,7 +118,8 @@ public class WebModule
return "/" + a.getArtifactId();
}
- public String getLibDir() {
+ public String getLibDir()
+ {
return "WEB-INF/lib";
}
}
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=1213471&r1=1213470&r2=1213471&view=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 Mon Dec 12 22:22:50 2011
@@ -141,8 +141,8 @@ public class ArtifactRepository
// If the groupId, the artifactId and if the
// artifact's type is known, then we have found a candidate.
- if ( a.getGroupId().equals( groupId ) && a.getArtifactId().equals( artifactId ) &&
- artifactTypeMappingService.isMappedToType( type, a.getType() ) )
+ if ( a.getGroupId().equals( groupId ) && a.getArtifactId().equals( artifactId )
+ && artifactTypeMappingService.isMappedToType( type, a.getType() ) )
{
result.add( a );
Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/ArtifactTypeMappingService.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/ArtifactTypeMappingService.java?rev=1213471&r1=1213470&r2=1213471&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/ArtifactTypeMappingService.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/ArtifactTypeMappingService.java Mon Dec 12 22:22:50 2011
@@ -88,8 +88,8 @@ public class ArtifactTypeMappingService
else if ( !EarModuleFactory.isStandardArtifactType( mapping ) )
{
throw new EarPluginException(
- "Invalid artifact type mapping, mapping[" + mapping + "] must be a standard Ear artifact type[" +
- EarModuleFactory.getStandardArtifactTypes() + "]" );
+ "Invalid artifact type mapping, mapping[" + mapping + "] must be a standard Ear artifact type["
+ + EarModuleFactory.getStandardArtifactTypes() + "]" );
}
else if ( customMappings.containsKey( customType ) )
{
@@ -121,8 +121,8 @@ public class ArtifactTypeMappingService
if ( !EarModuleFactory.isStandardArtifactType( standardType ) )
{
throw new IllegalStateException(
- "Artifact type[" + standardType + "] is not a standard Ear artifact type[" +
- EarModuleFactory.getStandardArtifactTypes() + "]" );
+ "Artifact type[" + standardType + "] is not a standard Ear artifact type["
+ + EarModuleFactory.getStandardArtifactTypes() + "]" );
}
final List typeMappings = (List) this.typeMappings.get( standardType );
return typeMappings.contains( customType );
Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/EarMavenArchiver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/EarMavenArchiver.java?rev=1213471&r1=1213470&r2=1213471&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/EarMavenArchiver.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/EarMavenArchiver.java Mon Dec 12 22:22:50 2011
@@ -1,17 +1,5 @@
package org.apache.maven.plugin.ear.util;
-import org.apache.maven.archiver.MavenArchiveConfiguration;
-import org.apache.maven.archiver.MavenArchiver;
-import org.apache.maven.artifact.DependencyResolutionRequiredException;
-import org.apache.maven.plugin.ear.EarModule;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.archiver.jar.Manifest;
-import org.codehaus.plexus.archiver.jar.ManifestException;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -31,6 +19,18 @@ import java.util.Set;
* under the License.
*/
+import org.apache.maven.archiver.MavenArchiveConfiguration;
+import org.apache.maven.archiver.MavenArchiver;
+import org.apache.maven.artifact.DependencyResolutionRequiredException;
+import org.apache.maven.plugin.ear.EarModule;
+import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.archiver.jar.Manifest;
+import org.codehaus.plexus.archiver.jar.ManifestException;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
/**
* A custom {@link MavenArchiver} implementation that takes care
* of setting the right classpath value according to the actual
Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/InvalidJavaEEVersion.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/InvalidJavaEEVersion.java?rev=1213471&r1=1213470&r2=1213471&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/InvalidJavaEEVersion.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/InvalidJavaEEVersion.java Mon Dec 12 22:22:50 2011
@@ -24,7 +24,8 @@ import org.apache.maven.plugin.MojoExecu
/**
* @author Stephane Nicoll
*/
-public class InvalidJavaEEVersion extends MojoExecutionException {
+public class InvalidJavaEEVersion extends MojoExecutionException
+{
private final String invalidVersion;
Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/JavaEEVersion.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/JavaEEVersion.java?rev=1213471&r1=1213470&r2=1213471&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/JavaEEVersion.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/JavaEEVersion.java Mon Dec 12 22:22:50 2011
@@ -162,8 +162,8 @@ public class JavaEEVersion
{
throw new IllegalArgumentException( "version could not be null." );
}
- return VERSION_1_3.equals( version ) || VERSION_1_4.equals( version ) || VERSION_5.equals( version ) ||
- VERSION_6.equals( version );
+ return VERSION_1_3.equals( version ) || VERSION_1_4.equals( version ) || VERSION_5.equals( version )
+ || VERSION_6.equals( version );
}
public int compareTo( Object other )