You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sn...@apache.org on 2010/09/03 18:49:00 UTC
svn commit: r992370 - in /maven/plugins/trunk/maven-ear-plugin: ./
src/main/java/org/apache/maven/plugin/ear/
src/main/java/org/apache/maven/plugin/ear/output/
src/main/java/org/apache/maven/plugin/ear/util/
src/test/java/org/apache/maven/plugin/ear/ s...
Author: snicoll
Date: Fri Sep 3 16:48:59 2010
New Revision: 992370
URL: http://svn.apache.org/viewvc?rev=992370&view=rev
Log:
code reformat according to maven code style. Initiated 2.4.3-SNAPSHOT
Modified:
maven/plugins/trunk/maven-ear-plugin/pom.xml
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/EarExecutionContext.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
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/Ejb3Module.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EjbModule.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/RarModule.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/output/FileNameMapping.java
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/output/FullFileNameMapping.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/output/StandardFileNameMapping.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/test/java/org/apache/maven/plugin/ear/AbstractEarTest.java
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/EarModuleTest.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/it/EarMojoIT.java
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/output/FileNameMappingFactoryTest.java
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/ArtifactRepositoryTest.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/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/pom.xml?rev=992370&r1=992369&r2=992370&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/pom.xml Fri Sep 3 16:48:59 2010
@@ -19,7 +19,8 @@ specific language governing permissions
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">
+<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">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -29,7 +30,7 @@ under the License.
</parent>
<artifactId>maven-ear-plugin</artifactId>
- <version>2.5-SNAPSHOT</version>
+ <version>2.4.3-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Maven EAR Plugin</name>
@@ -82,7 +83,7 @@ under the License.
<artifactId>plexus-archiver</artifactId>
<version>1.0</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-9-stable-1</version>
@@ -109,12 +110,12 @@ under the License.
<version>1.2</version>
<scope>test</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
- </dependency>
+ </dependency>
</dependencies>
<build>
@@ -149,9 +150,9 @@ under the License.
<configuration>
<tasks>
<copy overwrite="true" todir="${project.build.testOutputDirectory}/projects">
- <fileset dir="src/test/resources/projects" includes="**/pom.xml" />
+ <fileset dir="src/test/resources/projects" includes="**/pom.xml"/>
<filterset>
- <filter token="project.version" value="${project.version}" />
+ <filter token="project.version" value="${project.version}"/>
</filterset>
</copy>
</tasks>
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=992370&r1=992369&r2=992370&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 Fri Sep 3 16:48:59 2010
@@ -114,7 +114,7 @@ public abstract class AbstractEarModule
if ( candidates.size() > 1 )
{
throw new MojoFailureException( "Artifact[" + this + "] has " + candidates.size() +
- " candidates, please provide a classifier." );
+ " candidates, please provide a classifier." );
}
else
{
@@ -321,7 +321,8 @@ public abstract class AbstractEarModule
*
* @param uri the uri
*/
- void setUri(String uri) {
+ void setUri( String uri )
+ {
this.uri = uri;
}
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=992370&r1=992369&r2=992370&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 Fri Sep 3 16:48:59 2010
@@ -186,8 +186,8 @@ public abstract class AbstractEarMojo
getLog().debug( "Initializing ear execution context" );
EarExecutionContext earExecutionContext =
- new EarExecutionContext( project, mainArtifactId, defaultLibBundleDir, jbossConfiguration,
- fileNameMapping, typeMappingService);
+ new EarExecutionContext( project, mainArtifactId, defaultLibBundleDir, jbossConfiguration, fileNameMapping,
+ typeMappingService );
getLog().debug( "Resolving ear modules ..." );
allModules = new ArrayList();
@@ -202,7 +202,7 @@ public abstract class AbstractEarMojo
{
module = modules[i];
getLog().debug( "Resolving ear module[" + module + "]" );
- module.setEarExecutionContext( earExecutionContext );
+ module.setEarExecutionContext( earExecutionContext );
module.resolveArtifact( project.getArtifacts() );
allModules.add( module );
}
@@ -228,8 +228,7 @@ public abstract class AbstractEarMojo
filter.include( artifact ) )
{
EarModule module = EarModuleFactory.newEarModule( artifact, version, defaultLibBundleDir,
- includeLibInApplicationXml,
- typeMappingService);
+ includeLibInApplicationXml, typeMappingService );
module.setEarExecutionContext( earExecutionContext );
allModules.add( module );
}
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=992370&r1=992369&r2=992370&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 Fri Sep 3 16:48:59 2010
@@ -86,7 +86,6 @@ final class ApplicationXmlWriter
}
// Do not change this unless you really know what you're doing :)
-
final Iterator moduleIt = context.getEarModules().iterator();
while ( moduleIt.hasNext() )
{
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=992370&r1=992369&r2=992370&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 Fri Sep 3 16:48:59 2010
@@ -28,17 +28,24 @@ import java.util.List;
* @author <a href="snicoll@apache.org">Stephane Nicoll</a>
* @version $Id: ApplicationXmlWriter.java 728546 2008-12-21 22:56:51Z bentmann $
*/
-class ApplicationXmlWriterContext {
+class ApplicationXmlWriterContext
+{
private final File destinationFile;
+
private final List earModules;
+
private final List securityRoles;
+
private final String displayName;
+
private final String description;
+
private final String libraryDirectory;
- public ApplicationXmlWriterContext(File destinationFile, List earModules, List securityRoles,
- String displayName, String description, String libraryDirectory) {
+ public ApplicationXmlWriterContext( File destinationFile, List earModules, List securityRoles, String displayName,
+ String description, String libraryDirectory )
+ {
this.destinationFile = destinationFile;
this.earModules = earModules;
this.securityRoles = securityRoles;
@@ -52,7 +59,8 @@ class ApplicationXmlWriterContext {
*
* @return the output file
*/
- public File getDestinationFile() {
+ public File getDestinationFile()
+ {
return destinationFile;
}
@@ -61,7 +69,8 @@ class ApplicationXmlWriterContext {
*
* @return the ear modules
*/
- public List getEarModules() {
+ public List getEarModules()
+ {
return earModules;
}
@@ -70,7 +79,8 @@ class ApplicationXmlWriterContext {
*
* @return the security roles
*/
- public List getSecurityRoles() {
+ public List getSecurityRoles()
+ {
return securityRoles;
}
@@ -79,7 +89,8 @@ class ApplicationXmlWriterContext {
*
* @return the display name
*/
- public String getDisplayName() {
+ public String getDisplayName()
+ {
return displayName;
}
@@ -88,7 +99,8 @@ class ApplicationXmlWriterContext {
*
* @return the description
*/
- public String getDescription() {
+ public String getDescription()
+ {
return description;
}
@@ -97,7 +109,8 @@ class ApplicationXmlWriterContext {
*
* @return the library directory
*/
- public String getLibraryDirectory() {
+ public String getLibraryDirectory()
+ {
return libraryDirectory;
}
}
Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarExecutionContext.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarExecutionContext.java?rev=992370&r1=992369&r2=992370&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarExecutionContext.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarExecutionContext.java Fri Sep 3 16:48:59 2010
@@ -46,7 +46,8 @@ public class EarExecutionContext
JbossConfiguration jbossConfiguration, String fileNameMappingName,
ArtifactTypeMappingService typeMappingService )
{
- initialize( project, mainArtifactId, defaultLibBundleDir, jbossConfiguration, fileNameMappingName, typeMappingService );
+ initialize( project, mainArtifactId, defaultLibBundleDir, jbossConfiguration, fileNameMappingName,
+ typeMappingService );
}
@@ -70,11 +71,11 @@ public class EarExecutionContext
return artifactRepository;
}
- private void initialize( MavenProject project, String mainArtifactId, String defaultLibBundleDir, JbossConfiguration jbossConfiguration,
- String fileNameMappingName, ArtifactTypeMappingService typeMappingService )
+ private void initialize( MavenProject project, String mainArtifactId, String defaultLibBundleDir,
+ JbossConfiguration jbossConfiguration, String fileNameMappingName,
+ ArtifactTypeMappingService typeMappingService )
{
- this.artifactRepository = new ArtifactRepository( project.getArtifacts(), mainArtifactId,
- typeMappingService );
+ this.artifactRepository = new ArtifactRepository( project.getArtifacts(), mainArtifactId, typeMappingService );
this.defaultLibBundleDir = defaultLibBundleDir;
this.jbossConfiguration = jbossConfiguration;
if ( fileNameMappingName == null || fileNameMappingName.trim().length() == 0 )
Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModule.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModule.java?rev=992370&r1=992369&r2=992370&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModule.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModule.java Fri Sep 3 16:48:59 2010
@@ -84,7 +84,6 @@ public interface EarModule
* to the application's root directory.
*
* @return the alternative deployment descriptor for this module
- *
* @since JavaEE 5
*/
public String getAltDeploymentDescriptor();
@@ -103,12 +102,12 @@ public interface EarModule
* further the resolution.
*
* @param artifacts the project's artifacts
- * @throws EarPluginException if the artifact could not be resolved
+ * @throws EarPluginException if the artifact could not be resolved
* @throws MojoFailureException if an unexpected error occured
*/
public void resolveArtifact( Set artifacts )
throws EarPluginException, MojoFailureException;
- public void setEarExecutionContext(EarExecutionContext earExecutionContext);
+ public void setEarExecutionContext( EarExecutionContext earExecutionContext );
}
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=992370&r1=992369&r2=992370&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 Fri Sep 3 16:48:59 2010
@@ -49,7 +49,7 @@ public final class EarModuleFactory
temp.add( "sar" );
temp.add( "wsr" );
temp.add( "har" );
- standardArtifactTypes = Collections.unmodifiableList( temp );
+ standardArtifactTypes = Collections.unmodifiableList( temp );
}
/**
@@ -61,7 +61,7 @@ public final class EarModuleFactory
* @param javaEEVersion the javaEE version to use
* @param defaultLibBundleDir the default bundle dir for {@link org.apache.maven.plugin.ear.JarModule}
* @param includeInApplicationXml should {@link org.apache.maven.plugin.ear.JarModule} be included in application Xml
- * @param typeMappingService The artifact type mapping service
+ * @param typeMappingService The artifact type mapping service
* @return an ear module for this artifact
* @throws UnknownArtifactTypeException if the artifact is not handled
*/
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=992370&r1=992369&r2=992370&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 Fri Sep 3 16:48:59 2010
@@ -59,7 +59,7 @@ import java.util.List;
public class EarMojo
extends AbstractEarMojo
{
- private static final String[] EMPTY_STRING_ARRAY = {};
+ private static final String[] EMPTY_STRING_ARRAY = { };
/**
Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/Ejb3Module.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/Ejb3Module.java?rev=992370&r1=992369&r2=992370&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/Ejb3Module.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/Ejb3Module.java Fri Sep 3 16:48:59 2010
@@ -27,7 +27,6 @@ import org.apache.maven.artifact.Artifac
* @author Stephane Nicoll <sn...@apache.org>
* @author $Author$ (last edit)
* @version $Revision$
- *
* @deprecated ejb v3 is now properly handled by the standard
* ejb packaging type. use {@link EjbModule} instead
*/
Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EjbModule.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EjbModule.java?rev=992370&r1=992369&r2=992370&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EjbModule.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EjbModule.java Fri Sep 3 16:48:59 2010
@@ -49,7 +49,7 @@ public class EjbModule
writer.writeText( getUri() );
writer.endElement();
- writeAltDeploymentDescriptor( writer, version);
+ writeAltDeploymentDescriptor( writer, version );
writer.endElement();
}
Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java?rev=992370&r1=992369&r2=992370&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java Fri Sep 3 16:48:59 2010
@@ -45,7 +45,6 @@ public class GenerateApplicationXmlMojo
{
-
/**
* Whether the application.xml should be generated or not.
*
@@ -92,8 +91,8 @@ public class GenerateApplicationXmlMojo
else
{
// Check version
- if ( !version.equals( VERSION_1_3 ) && !version.equals( VERSION_1_4 ) &&
- !version.equals( VERSION_5 ) && !version.equals( VERSION_6 ) )
+ if ( !version.equals( VERSION_1_3 ) && !version.equals( VERSION_1_4 ) && !version.equals( VERSION_5 ) &&
+ !version.equals( VERSION_6 ) )
{
throw new MojoExecutionException( "Invalid version[" + version + "]" );
}
@@ -166,8 +165,9 @@ public class GenerateApplicationXmlMojo
File descriptor = new File( outputDir, "application.xml" );
final ApplicationXmlWriter writer = new ApplicationXmlWriter( version, encoding );
- final ApplicationXmlWriterContext context = new ApplicationXmlWriterContext(descriptor, getModules(),
- buildSecurityRoles(), displayName, description, defaultLibBundleDir);
+ final ApplicationXmlWriterContext context =
+ new ApplicationXmlWriterContext( descriptor, getModules(), buildSecurityRoles(), displayName, description,
+ defaultLibBundleDir );
writer.write( context );
}
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=992370&r1=992369&r2=992370&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 Fri Sep 3 16:48:59 2010
@@ -68,8 +68,8 @@ public class JarModule
writer.writeText( getUri() );
writer.endElement();
- writeAltDeploymentDescriptor( writer, version);
-
+ writeAltDeploymentDescriptor( writer, version );
+
writer.endElement();
}
}
Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/RarModule.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/RarModule.java?rev=992370&r1=992369&r2=992370&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/RarModule.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/RarModule.java Fri Sep 3 16:48:59 2010
@@ -49,8 +49,8 @@ public class RarModule
writer.writeText( getUri() );
writer.endElement();
- writeAltDeploymentDescriptor( writer, version);
-
+ writeAltDeploymentDescriptor( writer, version );
+
writer.endElement();
}
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=992370&r1=992369&r2=992370&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 Fri Sep 3 16:48:59 2010
@@ -66,8 +66,8 @@ public class WebModule
writer.endElement(); // web
- writeAltDeploymentDescriptor( writer, version);
-
+ writeAltDeploymentDescriptor( writer, version );
+
writer.endElement(); // module
}
Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/output/FileNameMapping.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/output/FileNameMapping.java?rev=992370&r1=992369&r2=992370&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/output/FileNameMapping.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/output/FileNameMapping.java Fri Sep 3 16:48:59 2010
@@ -25,7 +25,7 @@ import org.apache.maven.artifact.Artifac
* Maps file name {@link Artifact}.
* <p/>
* TODO: it might be easier to use a token-based approach instead.
- *
+ *
* @author <a href="snicoll@apache.org">Stephane Nicoll</a>
* @version $Id$
*/
@@ -38,5 +38,5 @@ public interface FileNameMapping
* @param a the artifact
* @return the name of the file for the specified artifact
*/
- String mapFileName(final Artifact a);
+ String mapFileName( final Artifact a );
}
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=992370&r1=992369&r2=992370&view=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 Fri Sep 3 16:48:59 2010
@@ -19,9 +19,6 @@ package org.apache.maven.plugin.ear.outp
* under the License.
*/
-import java.util.HashMap;
-import java.util.Map;
-
/**
* Provides access to {@link FileNameMapping} implementations.
* <p/>
@@ -46,7 +43,7 @@ public class FileNameMappingFactory
public static FileNameMapping getDefaultFileNameMapping()
{
- return new StandardFileNameMapping() ;
+ return new StandardFileNameMapping();
}
/**
@@ -60,36 +57,38 @@ public class FileNameMappingFactory
public static FileNameMapping getFileNameMapping( final String nameOrClass )
throws IllegalStateException
{
- if (STANDARD_FILE_NAME_MAPPING.equals( nameOrClass )){
+ if ( STANDARD_FILE_NAME_MAPPING.equals( nameOrClass ) )
+ {
return getDefaultFileNameMapping();
}
- if (FULL_FILE_NAME_MAPPING.equals( nameOrClass )){
+ if ( FULL_FILE_NAME_MAPPING.equals( nameOrClass ) )
+ {
return new FullFileNameMapping();
}
- try
- {
- final Class c = Class.forName( nameOrClass );
- return (FileNameMapping) c.newInstance();
- }
- catch ( ClassNotFoundException e )
- {
- throw new IllegalStateException(
- "File name mapping implementation[" + nameOrClass + "] was not found " + e.getMessage() );
- }
- catch ( InstantiationException e )
- {
- throw new IllegalStateException( "Could not instanciate file name mapping implementation[" +
- nameOrClass + "] make sure it has a default public constructor" );
- }
- catch ( IllegalAccessException e )
- {
- throw new IllegalStateException( "Could not access file name mapping implementation[" + nameOrClass +
- "] make sure it has a default public constructor" );
- }
- catch ( ClassCastException e )
- {
- throw new IllegalStateException( "Specified class[" + nameOrClass + "] does not implement[" +
- FileNameMapping.class.getName() + "]" );
- }
+ try
+ {
+ final Class c = Class.forName( nameOrClass );
+ return (FileNameMapping) c.newInstance();
+ }
+ catch ( ClassNotFoundException e )
+ {
+ throw new IllegalStateException(
+ "File name mapping implementation[" + nameOrClass + "] was not found " + e.getMessage() );
+ }
+ catch ( InstantiationException e )
+ {
+ throw new IllegalStateException( "Could not instanciate file name mapping implementation[" + nameOrClass +
+ "] make sure it has a default public constructor" );
+ }
+ catch ( IllegalAccessException e )
+ {
+ throw new IllegalStateException( "Could not access file name mapping implementation[" + nameOrClass +
+ "] make sure it has a default public constructor" );
+ }
+ catch ( ClassCastException e )
+ {
+ throw new IllegalStateException(
+ "Specified class[" + nameOrClass + "] does not implement[" + FileNameMapping.class.getName() + "]" );
+ }
}
}
Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/output/FullFileNameMapping.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/output/FullFileNameMapping.java?rev=992370&r1=992369&r2=992370&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/output/FullFileNameMapping.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/output/FullFileNameMapping.java Fri Sep 3 16:48:59 2010
@@ -28,12 +28,13 @@ import org.apache.maven.artifact.Artifac
* @author <a href="snicoll@apache.org">Stephane Nicoll</a>
* @version $Id$
*/
-public class FullFileNameMapping implements FileNameMapping
+public class FullFileNameMapping
+ implements FileNameMapping
{
-
+
public String mapFileName( final Artifact a )
{
- final String dashedGroupId = a.getGroupId().replace( '.', '-');
+ final String dashedGroupId = a.getGroupId().replace( '.', '-' );
return dashedGroupId + "-" + a.getFile().getName();
}
}
Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/output/StandardFileNameMapping.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/output/StandardFileNameMapping.java?rev=992370&r1=992369&r2=992370&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/output/StandardFileNameMapping.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/output/StandardFileNameMapping.java Fri Sep 3 16:48:59 2010
@@ -28,7 +28,8 @@ import org.apache.maven.artifact.Artifac
* @author <a href="snicoll@apache.org">Stephane Nicoll</a>
* @version $Id$
*/
-public class StandardFileNameMapping implements FileNameMapping
+public class StandardFileNameMapping
+ implements FileNameMapping
{
public String mapFileName( final Artifact a )
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=992370&r1=992369&r2=992370&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 Fri Sep 3 16:48:59 2010
@@ -42,8 +42,8 @@ public class ArtifactRepository
/**
* Creates a new repository wih the specified artifacts.
*
- * @param artifacts the artifacts
- * @param mainArtifactId the id to use for the main artifact (no classifier)
+ * @param artifacts the artifacts
+ * @param mainArtifactId the id to use for the main artifact (no classifier)
* @param artifactTypeMappingService
*/
public ArtifactRepository( Set artifacts, String mainArtifactId,
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=992370&r1=992369&r2=992370&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 Fri Sep 3 16:48:59 2010
@@ -51,7 +51,7 @@ public class ArtifactTypeMappingService
// The user-defined mapping for direct access
private final Map customMappings;
- public ArtifactTypeMappingService( )
+ public ArtifactTypeMappingService()
{
this.typeMappings = new HashMap();
this.customMappings = new HashMap();
@@ -87,8 +87,9 @@ 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() + "]" );
+ throw new EarPluginException(
+ "Invalid artifact type mapping, mapping[" + mapping + "] must be a standard Ear artifact type[" +
+ EarModuleFactory.getStandardArtifactTypes() + "]" );
}
else if ( customMappings.containsKey( customType ) )
{
@@ -119,8 +120,9 @@ public class ArtifactTypeMappingService
{
if ( !EarModuleFactory.isStandardArtifactType( standardType ) )
{
- throw new IllegalStateException( "Artifact type[" + standardType +
- "] is not a standard Ear artifact type[" + EarModuleFactory.getStandardArtifactTypes() + "]" );
+ throw new IllegalStateException(
+ "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/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=992370&r1=992369&r2=992370&view=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 Fri Sep 3 16:48:59 2010
@@ -1,7 +1,6 @@
package org.apache.maven.plugin.ear;
import junit.framework.TestCase;
-
import org.apache.maven.artifact.Artifact;
import java.util.Set;
Modified: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/EarModuleTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/EarModuleTest.java?rev=992370&r1=992369&r2=992370&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/EarModuleTest.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/EarModuleTest.java Fri Sep 3 16:48:59 2010
@@ -27,14 +27,16 @@ import junit.framework.TestCase;
* @author <a href="snicoll@apache.org">Stephane Nicoll</a>
* @version $Id$
*/
-public class EarModuleTest extends TestCase
+public class EarModuleTest
+ extends TestCase
{
- public void testCleanBuildDir() {
- assertEquals("APP-INF/lib/", AbstractEarModule.cleanBundleDir( "APP-INF/lib"));
- assertEquals("APP-INF/lib/", AbstractEarModule.cleanBundleDir( "APP-INF/lib/"));
- assertEquals("APP-INF/lib/", AbstractEarModule.cleanBundleDir( "/APP-INF/lib"));
- assertEquals("APP-INF/lib/", AbstractEarModule.cleanBundleDir( "/APP-INF/lib/"));
- assertEquals("", AbstractEarModule.cleanBundleDir( "/"));
+ public void testCleanBuildDir()
+ {
+ assertEquals( "APP-INF/lib/", AbstractEarModule.cleanBundleDir( "APP-INF/lib" ) );
+ assertEquals( "APP-INF/lib/", AbstractEarModule.cleanBundleDir( "APP-INF/lib/" ) );
+ assertEquals( "APP-INF/lib/", AbstractEarModule.cleanBundleDir( "/APP-INF/lib" ) );
+ assertEquals( "APP-INF/lib/", AbstractEarModule.cleanBundleDir( "/APP-INF/lib/" ) );
+ assertEquals( "", AbstractEarModule.cleanBundleDir( "/" ) );
}
}
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=992370&r1=992369&r2=992370&view=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 Fri Sep 3 16:48:59 2010
@@ -20,7 +20,6 @@ package org.apache.maven.plugin.ear.it;
*/
import junit.framework.TestCase;
-
import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
Modified: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/EarMojoIT.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/EarMojoIT.java?rev=992370&r1=992369&r2=992370&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/EarMojoIT.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/EarMojoIT.java Fri Sep 3 16:48:59 2010
@@ -41,7 +41,7 @@ public class EarMojoIT
public void testProject001()
throws Exception
{
- doTestProject( "project-001", new String[]{"ejb-sample-one-1.0.jar"} );
+ doTestProject( "project-001", new String[]{ "ejb-sample-one-1.0.jar" } );
}
/**
@@ -50,7 +50,7 @@ public class EarMojoIT
public void testProject002()
throws Exception
{
- doTestProject( "project-002", new String[]{"APP-INF/lib/ejb-sample-one-1.0.jar", "ejb-sample-two.jar"} );
+ doTestProject( "project-002", new String[]{ "APP-INF/lib/ejb-sample-one-1.0.jar", "ejb-sample-two.jar" } );
}
/**
@@ -59,8 +59,8 @@ public class EarMojoIT
public void testProject003()
throws Exception
{
- doTestProject( "project-003", new String[]{"ejb-sample-one-1.0.jar", "APP-INF/lib/jar-sample-one-1.0.jar",
- "APP-INF/lib/jar-sample-two-1.0.jar"} );
+ doTestProject( "project-003", new String[]{ "ejb-sample-one-1.0.jar", "APP-INF/lib/jar-sample-one-1.0.jar",
+ "APP-INF/lib/jar-sample-two-1.0.jar" } );
}
/**
@@ -70,8 +70,8 @@ public class EarMojoIT
public void testProject004()
throws Exception
{
- doTestProject( "project-004", new String[]{"ejb-sample-one-1.0.jar", "jar-sample-one-1.0.jar",
- "APP-INF/lib/jar-sample-two-1.0.jar"} );
+ doTestProject( "project-004", new String[]{ "ejb-sample-one-1.0.jar", "jar-sample-one-1.0.jar",
+ "APP-INF/lib/jar-sample-two-1.0.jar" } );
}
/**
@@ -80,7 +80,7 @@ public class EarMojoIT
public void testProject005()
throws Exception
{
- doTestProject( "project-005", new String[]{"ejb-sample-one-1.0.jar", "libs/another-name.jar"} );
+ doTestProject( "project-005", new String[]{ "ejb-sample-one-1.0.jar", "libs/another-name.jar" } );
}
/**
@@ -89,7 +89,7 @@ public class EarMojoIT
public void testProject006()
throws Exception
{
- doTestProject( "project-006", new String[]{"ejb-sample-one-1.0.jar", "jar-sample-two-1.0.jar"} );
+ doTestProject( "project-006", new String[]{ "ejb-sample-one-1.0.jar", "jar-sample-two-1.0.jar" } );
}
/**
@@ -98,7 +98,7 @@ public class EarMojoIT
public void testProject007()
throws Exception
{
- doTestProject( "project-007", new String[]{"ejb-sample-one-1.0-classified.jar"} );
+ doTestProject( "project-007", new String[]{ "ejb-sample-one-1.0-classified.jar" } );
}
/**
@@ -107,7 +107,7 @@ public class EarMojoIT
public void testProject008()
throws Exception
{
- doTestProject( "project-008", new String[]{"ejb-sample-one-1.0.jar"} );
+ doTestProject( "project-008", new String[]{ "ejb-sample-one-1.0.jar" } );
}
/**
@@ -116,7 +116,7 @@ public class EarMojoIT
public void testProject009()
throws Exception
{
- doTestProject( "project-009", new String[]{"ejb-sample-one-1.0.jar"} );
+ doTestProject( "project-009", new String[]{ "ejb-sample-one-1.0.jar" } );
}
/**
@@ -125,7 +125,7 @@ public class EarMojoIT
public void testProject010()
throws Exception
{
- doTestProject( "project-010", new String[]{"ejb-sample-one-1.0.jar"} );
+ doTestProject( "project-010", new String[]{ "ejb-sample-one-1.0.jar" } );
}
/**
@@ -134,7 +134,7 @@ public class EarMojoIT
public void testProject011()
throws Exception
{
- doTestProject( "project-011", new String[]{"ejb-sample-one-1.0.jar"} );
+ doTestProject( "project-011", new String[]{ "ejb-sample-one-1.0.jar" } );
}
/**
@@ -143,7 +143,7 @@ public class EarMojoIT
public void testProject012()
throws Exception
{
- doTestProject( "project-012", new String[]{"README.txt", "LICENSE.txt", "ejb-sample-one-1.0.jar"} );
+ doTestProject( "project-012", new String[]{ "README.txt", "LICENSE.txt", "ejb-sample-one-1.0.jar" } );
}
/**
@@ -152,7 +152,7 @@ public class EarMojoIT
public void testProject013()
throws Exception
{
- doTestProject( "project-013", new String[]{"README.txt", "LICENSE.txt", "ejb-sample-one-1.0.jar"} );
+ doTestProject( "project-013", new String[]{ "README.txt", "LICENSE.txt", "ejb-sample-one-1.0.jar" } );
}
/**
@@ -161,7 +161,7 @@ public class EarMojoIT
public void testProject014()
throws Exception
{
- doTestProject( "project-014", new String[]{"LICENSE.txt", "ejb-sample-one-1.0.jar"} );
+ doTestProject( "project-014", new String[]{ "LICENSE.txt", "ejb-sample-one-1.0.jar" } );
}
/**
@@ -170,7 +170,7 @@ public class EarMojoIT
public void testProject015()
throws Exception
{
- final File baseDir = doTestProject( "project-015", new String[]{"ejb-sample-one-1.0.jar"} );
+ final File baseDir = doTestProject( "project-015", new String[]{ "ejb-sample-one-1.0.jar" } );
final File expectedManifest = new File( baseDir, "src/main/application/META-INF/MANIFEST.MF" );
final File actualManifest = new File( getEarDirectory( baseDir, "project-015" ), "META-INF/MANIFEST.MF" );
assertTrue( "Manifest was not copied", actualManifest.exists() );
@@ -197,7 +197,7 @@ public class EarMojoIT
public void testProject017()
throws Exception
{
- doTestProject( "project-017", new String[]{"ejb-sample-one-1.0.jar"} );
+ doTestProject( "project-017", new String[]{ "ejb-sample-one-1.0.jar" } );
}
/**
@@ -218,8 +218,8 @@ public class EarMojoIT
throws Exception
{
doTestProject( "project-019",
- new String[]{"ejb-sample-one-1.0.jar", "sar-sample-one-1.0.sar", "jar-sample-one-1.0.jar"},
- new boolean[]{false, true, true} );
+ new String[]{ "ejb-sample-one-1.0.jar", "sar-sample-one-1.0.sar", "jar-sample-one-1.0.jar" },
+ new boolean[]{ false, true, true } );
}
/**
@@ -229,8 +229,8 @@ public class EarMojoIT
throws Exception
{
doTestProject( "project-020",
- new String[]{"ejb-sample-one-1.0.jar", "sar-sample-one-1.0.sar", "jar-sample-one-1.0.jar"},
- new boolean[]{true, false, false} );
+ new String[]{ "ejb-sample-one-1.0.jar", "sar-sample-one-1.0.sar", "jar-sample-one-1.0.jar" },
+ new boolean[]{ true, false, false } );
}
/**
@@ -240,9 +240,9 @@ public class EarMojoIT
throws Exception
{
doTestProject( "project-021",
- new String[]{"ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar", "sar-sample-one-1.0.sar",
- "jar-sample-one-1.0.jar", "jar-sample-two-1.0.jar"},
- new boolean[]{false, true, false, false, true} );
+ new String[]{ "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar", "sar-sample-one-1.0.sar",
+ "jar-sample-one-1.0.jar", "jar-sample-two-1.0.jar" },
+ new boolean[]{ false, true, false, false, true } );
}
/**
@@ -262,8 +262,8 @@ public class EarMojoIT
public void testProject023()
throws Exception
{
- doTestProject( "project-023", new String[]{"ejb-sample-one-1.0-classified.jar", "ejb-sample-two-1.0.jar"},
- new boolean[]{true, false} );
+ doTestProject( "project-023", new String[]{ "ejb-sample-one-1.0-classified.jar", "ejb-sample-two-1.0.jar" },
+ new boolean[]{ true, false } );
}
/**
@@ -272,8 +272,8 @@ public class EarMojoIT
public void testProject024()
throws Exception
{
- doTestProject( "project-024", new String[]{"ejb-sample-one-1.0-classified.jar", "ejb-sample-two-1.0.jar"},
- new boolean[]{true, false} );
+ doTestProject( "project-024", new String[]{ "ejb-sample-one-1.0-classified.jar", "ejb-sample-two-1.0.jar" },
+ new boolean[]{ true, false } );
}
/**
@@ -282,8 +282,8 @@ public class EarMojoIT
public void testProject025()
throws Exception
{
- doTestProject( "project-025", new String[]{"ejb-sample-one-1.0-classified.jar", "ejb-sample-one-1.0.jar"},
- new boolean[]{true, false} );
+ doTestProject( "project-025", new String[]{ "ejb-sample-one-1.0-classified.jar", "ejb-sample-one-1.0.jar" },
+ new boolean[]{ true, false } );
}
/**
@@ -303,7 +303,7 @@ public class EarMojoIT
public void testProject027()
throws Exception
{
- doTestProject( "project-027", new String[]{"ejb-sample-one-1.0.jar"} );
+ doTestProject( "project-027", new String[]{ "ejb-sample-one-1.0.jar" } );
}
/**
@@ -312,7 +312,7 @@ public class EarMojoIT
public void testProject028()
throws Exception
{
- doTestProject( "project-028", new String[]{"ejb-sample-one-1.0.jar"} );
+ doTestProject( "project-028", new String[]{ "ejb-sample-one-1.0.jar" } );
}
/**
@@ -321,7 +321,7 @@ public class EarMojoIT
public void testProject029()
throws Exception
{
- doTestProject( "project-029", new String[]{"ejb-sample-one-1.0.jar"} );
+ doTestProject( "project-029", new String[]{ "ejb-sample-one-1.0.jar" } );
}
/**
@@ -331,7 +331,7 @@ public class EarMojoIT
public void testProject030()
throws Exception
{
- doTestProject( "project-030", new String[]{"ejb-sample-one-1.0.jar", "ejb-sample-two-1.0-client.jar"} );
+ doTestProject( "project-030", new String[]{ "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0-client.jar" } );
}
/**
@@ -341,7 +341,7 @@ public class EarMojoIT
public void testProject031()
throws Exception
{
- doTestProject( "project-031", new String[]{"ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar"} );
+ doTestProject( "project-031", new String[]{ "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
}
/**
@@ -350,7 +350,7 @@ public class EarMojoIT
public void testProject032()
throws Exception
{
- doTestProject( "project-032", new String[]{"ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar"} );
+ doTestProject( "project-032", new String[]{ "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
}
/**
@@ -360,8 +360,8 @@ public class EarMojoIT
throws Exception
{
doTestProject( "project-033",
- new String[]{"ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar", "sar-sample-one-1.0.sar",
- "har-sample-one-1.0.har"} );
+ new String[]{ "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar", "sar-sample-one-1.0.sar",
+ "har-sample-one-1.0.har" } );
}
/**
@@ -370,7 +370,7 @@ public class EarMojoIT
public void testProject034()
throws Exception
{
- doTestProject( "project-034", new String[]{"ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar"} );
+ doTestProject( "project-034", new String[]{ "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
}
/**
@@ -380,9 +380,9 @@ public class EarMojoIT
throws Exception
{
doTestProject( "project-035",
- new String[]{"foo/eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0.jar",
+ new String[]{ "foo/eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0.jar",
"libs/eartest-jar-sample-one-1.0.jar", "libs/eartest-jar-sample-two-1.0.jar",
- "sar-sample-one.sar"} );
+ "sar-sample-one.sar" } );
}
/**
@@ -392,10 +392,10 @@ public class EarMojoIT
throws Exception
{
doTestProject( "project-036",
- new String[]{"foo/eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0.jar",
+ new String[]{ "foo/eartest-ejb-sample-one-1.0.jar", "eartest-ejb-sample-two-1.0.jar",
"com-foo-bar-ejb-sample-one-1.0.jar", "com-foo-bar-ejb-sample-two-1.0.jar",
"libs/eartest-jar-sample-one-1.0.jar", "libs/eartest-jar-sample-two-1.0.jar",
- "sar-sample-one.sar"} );
+ "sar-sample-one.sar" } );
}
/**
@@ -405,7 +405,7 @@ public class EarMojoIT
public void testProject037()
throws Exception
{
- doTestProject( "project-037", new String[]{"ejb-sample-one-1.0.jar", "ejb-sample-two-1.0-client.jar"} );
+ doTestProject( "project-037", new String[]{ "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0-client.jar" } );
}
/**
@@ -415,8 +415,8 @@ public class EarMojoIT
public void testProject038()
throws Exception
{
- doTestProject( "project-038", new String[]{"ejb-sample-one-1.0-classified.jar", "ejb-sample-one-1.0.jar"},
- new boolean[]{false, true} );
+ doTestProject( "project-038", new String[]{ "ejb-sample-one-1.0-classified.jar", "ejb-sample-one-1.0.jar" },
+ new boolean[]{ false, true } );
}
/**
@@ -425,7 +425,7 @@ public class EarMojoIT
public void testProject039()
throws Exception
{
- doTestProject( "project-039", new String[]{"ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar"} );
+ doTestProject( "project-039", new String[]{ "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
}
/**
@@ -435,7 +435,7 @@ public class EarMojoIT
public void testProject040()
throws Exception
{
- doTestProject( "project-040", new String[]{"ejb-sample-one-1.0.jar"} );
+ doTestProject( "project-040", new String[]{ "ejb-sample-one-1.0.jar" } );
}
/**
@@ -444,7 +444,7 @@ public class EarMojoIT
public void testProject041()
throws Exception
{
- doTestProject( "project-041", new String[]{"ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar"} );
+ doTestProject( "project-041", new String[]{ "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
}
/**
@@ -453,7 +453,7 @@ public class EarMojoIT
public void testProject042()
throws Exception
{
- doTestProject( "project-042", new String[]{"ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar"} );
+ doTestProject( "project-042", new String[]{ "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
}
@@ -463,7 +463,7 @@ public class EarMojoIT
public void testProject043()
throws Exception
{
- final File baseDir = doTestProject( "project-043", new String[]{"ejb-sample-one-1.0.jar"} );
+ final File baseDir = doTestProject( "project-043", new String[]{ "ejb-sample-one-1.0.jar" } );
final File expectedApplicationXml = new File( baseDir, "target/custom-descriptor-dir/application.xml" );
assertTrue( "Application.xml file not found", expectedApplicationXml.exists() );
assertFalse( "Application.xml file should not be empty", expectedApplicationXml.length() == 0 );
@@ -475,7 +475,7 @@ public class EarMojoIT
public void testProject044()
throws Exception
{
- doTestProject( "project-044", new String[]{"ejb-sample-one-1.0.jar", "myLibs/jar-sample-one-1.0.jar"} );
+ doTestProject( "project-044", new String[]{ "ejb-sample-one-1.0.jar", "myLibs/jar-sample-one-1.0.jar" } );
}
/**
@@ -484,7 +484,7 @@ public class EarMojoIT
public void testProject045()
throws Exception
{
- final File baseDir = doTestProject( "project-045", new String[]{"README.txt", "ejb-sample-one-1.0.jar"} );
+ final File baseDir = doTestProject( "project-045", new String[]{ "README.txt", "ejb-sample-one-1.0.jar" } );
final File actualReadme = new File( getEarDirectory( baseDir, "project-045" ), "README.txt" );
final String content = IOUtil.toString( ReaderFactory.newReader( actualReadme, "UTF-8" ) );
assertTrue( "application name and version was not filtered properly", content.indexOf( "my-app 99.0" ) != -1 );
@@ -499,7 +499,7 @@ public class EarMojoIT
public void testProject046()
throws Exception
{
- final File baseDir = doTestProject( "project-046", new String[]{"README.txt", "ejb-sample-one-1.0.jar"} );
+ final File baseDir = doTestProject( "project-046", new String[]{ "README.txt", "ejb-sample-one-1.0.jar" } );
final File actualReadme = new File( getEarDirectory( baseDir, "project-046" ), "README.txt" );
final String content = IOUtil.toString( ReaderFactory.newReader( actualReadme, "UTF-8" ) );
assertTrue( "application name and version was not filtered properly", content.indexOf( "my-app 99.0" ) != -1 );
@@ -514,7 +514,7 @@ public class EarMojoIT
public void testProject047()
throws Exception
{
- final File baseDir = doTestProject( "project-047", new String[]{"README.txt", "ejb-sample-one-1.0.jar"} );
+ final File baseDir = doTestProject( "project-047", new String[]{ "README.txt", "ejb-sample-one-1.0.jar" } );
final File actualReadme = new File( getEarDirectory( baseDir, "project-047" ), "README.txt" );
final String content = IOUtil.toString( ReaderFactory.newReader( actualReadme, "UTF-8" ) );
assertTrue( "application name and version should not have been filtered",
@@ -529,7 +529,7 @@ public class EarMojoIT
public void testProject048()
throws Exception
{
- doTestProject( "project-048", new String[]{"ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar"} );
+ doTestProject( "project-048", new String[]{ "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
}
/**
@@ -538,7 +538,7 @@ public class EarMojoIT
public void testProject049()
throws Exception
{
- doTestProject( "project-049", new String[]{"ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar"} );
+ doTestProject( "project-049", new String[]{ "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
}
/**
@@ -547,7 +547,7 @@ public class EarMojoIT
public void testProject050()
throws Exception
{
- doTestProject( "project-050", new String[]{"ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar"} );
+ doTestProject( "project-050", new String[]{ "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
}
/**
@@ -556,7 +556,7 @@ public class EarMojoIT
public void testProject051()
throws Exception
{
- doTestProject( "project-051", new String[]{"ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar"} );
+ doTestProject( "project-051", new String[]{ "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
}
/**
@@ -565,7 +565,7 @@ public class EarMojoIT
public void testProject052()
throws Exception
{
- doTestProject( "project-052", new String[]{"ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar"} );
+ doTestProject( "project-052", new String[]{ "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
}
/**
@@ -574,7 +574,7 @@ public class EarMojoIT
public void testProject053()
throws Exception
{
- doTestProject( "project-053", new String[]{"ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar"} );
+ doTestProject( "project-053", new String[]{ "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
}
/**
@@ -583,7 +583,7 @@ public class EarMojoIT
public void testProject054()
throws Exception
{
- doTestProject( "project-054", new String[]{"ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar"} );
+ doTestProject( "project-054", new String[]{ "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
}
/**
@@ -592,8 +592,8 @@ public class EarMojoIT
public void testProject055()
throws Exception
{
- doTestProject( "project-055", new String[]{"jar-sample-one-1.0.jar", "jar-sample-two-1.0.jar",
- "jar-sample-three-with-deps-1.0.jar"} );
+ doTestProject( "project-055", new String[]{ "jar-sample-one-1.0.jar", "jar-sample-two-1.0.jar",
+ "jar-sample-three-with-deps-1.0.jar" } );
}
/**
@@ -603,7 +603,7 @@ public class EarMojoIT
public void testProject056()
throws Exception
{
- doTestProject( "project-056", new String[]{"ejb-sample-one-1.0.jar"} );
+ doTestProject( "project-056", new String[]{ "ejb-sample-one-1.0.jar" } );
}
@@ -614,7 +614,7 @@ public class EarMojoIT
public void testProject057()
throws Exception
{
- doTestProject( "project-057", new String[]{"ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar"} );
+ doTestProject( "project-057", new String[]{ "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } );
}
/**
@@ -623,7 +623,7 @@ public class EarMojoIT
public void testProject058()
throws Exception
{
- doTestProject( "project-058", new String[]{"ejb-sample-one-1.0.jar"} );
+ doTestProject( "project-058", new String[]{ "ejb-sample-one-1.0.jar" } );
}
/**
@@ -632,7 +632,7 @@ public class EarMojoIT
public void testProject059()
throws Exception
{
- doTestProject( "project-059", new String[]{"ejb-sample-one-1.0.jar"} );
+ doTestProject( "project-059", new String[]{ "ejb-sample-one-1.0.jar" } );
}
/**
@@ -643,7 +643,7 @@ public class EarMojoIT
public void testProject060()
throws Exception
{
- doTestProject( "project-060", new String[]{"ejb-sample-one-1.0.jar", "ejb-sample-two-1.0-client.jar"} );
+ doTestProject( "project-060", new String[]{ "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0-client.jar" } );
}
/**
@@ -654,7 +654,7 @@ public class EarMojoIT
public void testProject061()
throws Exception
{
- doTestProject( "project-061", new String[]{"ejb-sample-one-1.0.jar", "ejb-sample-two-1.0-client.jar"} );
+ doTestProject( "project-061", new String[]{ "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0-client.jar" } );
}
/**
@@ -665,7 +665,7 @@ public class EarMojoIT
public void testProject062()
throws Exception
{
- doTestProject( "project-062", new String[]{"ejb-sample-one-1.0.jar", "lib/ejb-sample-two-1.0-client.jar"} );
+ doTestProject( "project-062", new String[]{ "ejb-sample-one-1.0.jar", "lib/ejb-sample-two-1.0-client.jar" } );
}
/**
@@ -676,7 +676,7 @@ public class EarMojoIT
public void testProject063()
throws Exception
{
- doTestProject( "project-063", new String[]{"lib/ejb-sample-two-1.0-client.jar"} );
+ doTestProject( "project-063", new String[]{ "lib/ejb-sample-two-1.0-client.jar" } );
}
/**
@@ -687,7 +687,7 @@ public class EarMojoIT
public void testProject064()
throws Exception
{
- doTestProject( "project-064", new String[]{"ejb-sample-one-1.0.jar", "ejb-sample-two-1.0-client.jar"} );
+ doTestProject( "project-064", new String[]{ "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0-client.jar" } );
}
}
Modified: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/output/FileNameMappingFactoryTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/output/FileNameMappingFactoryTest.java?rev=992370&r1=992369&r2=992370&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/output/FileNameMappingFactoryTest.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/output/FileNameMappingFactoryTest.java Fri Sep 3 16:48:59 2010
@@ -36,6 +36,7 @@ import junit.framework.TestCase;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
/**
* @author <a href="snicoll@apache.org">Stephane Nicoll</a>
* @version $Id$
@@ -67,16 +68,17 @@ public class FileNameMappingFactoryTest
assertEquals( FullFileNameMapping.class, actual.getClass() );
}
- public void testGetFileNameMappingByClass() {
- final FileNameMapping actual = FileNameMappingFactory.getFileNameMapping(StandardFileNameMapping.class.getName());
- assertNotNull( actual);
- assertEquals( StandardFileNameMapping.class, actual.getClass());
+ public void testGetFileNameMappingByClass()
+ {
+ final FileNameMapping actual =
+ FileNameMappingFactory.getFileNameMapping( StandardFileNameMapping.class.getName() );
+ assertNotNull( actual );
+ assertEquals( StandardFileNameMapping.class, actual.getClass() );
}
public void testGetFileNameMappingByClass2()
{
- final FileNameMapping actual =
- FileNameMappingFactory.getFileNameMapping( FullFileNameMapping.class.getName() );
+ final FileNameMapping actual = FileNameMappingFactory.getFileNameMapping( FullFileNameMapping.class.getName() );
assertNotNull( actual );
assertEquals( FullFileNameMapping.class, actual.getClass() );
}
@@ -86,7 +88,7 @@ public class FileNameMappingFactoryTest
try
{
FileNameMappingFactory.getFileNameMapping( "com.foo.bar" );
- fail("Should have failed");
+ fail( "Should have failed" );
}
catch ( IllegalStateException e )
{
Modified: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/ArtifactRepositoryTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/ArtifactRepositoryTest.java?rev=992370&r1=992369&r2=992370&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/ArtifactRepositoryTest.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/ArtifactRepositoryTest.java Fri Sep 3 16:48:59 2010
@@ -44,8 +44,8 @@ public class ArtifactRepositoryTest
public void testEmptyRepository()
{
ArtifactTypeMappingService artifactTypeMappingService = new ArtifactTypeMappingService();
- ArtifactRepository repo = new ArtifactRepository( createArtifacts( null ), MAIN_ARTIFACT_ID,
- artifactTypeMappingService );
+ ArtifactRepository repo =
+ new ArtifactRepository( createArtifacts( null ), MAIN_ARTIFACT_ID, artifactTypeMappingService );
assertNull( repo.getUniqueArtifact( "ear", "ar", "jar" ) );
assertNull( repo.getUniqueArtifact( "ear", "ar", "jar", null ) );
assertNull( repo.getUniqueArtifact( "ear", "ar", "jar", "class" ) );
@@ -55,7 +55,7 @@ public class ArtifactRepositoryTest
{
ArtifactTypeMappingService artifactTypeMappingService = new ArtifactTypeMappingService();
ArtifactRepository repo =
- new ArtifactRepository( createArtifacts( new String[]{"myartifact"} ), MAIN_ARTIFACT_ID,
+ new ArtifactRepository( createArtifacts( new String[]{ "myartifact" } ), MAIN_ARTIFACT_ID,
artifactTypeMappingService );
assertNotNull( repo.getUniqueArtifact( DEFAULT_GROUPID, "myartifact", "jar" ) );
assertNotNull( repo.getUniqueArtifact( DEFAULT_GROUPID, "myartifact", "jar", null ) );
@@ -65,7 +65,7 @@ public class ArtifactRepositoryTest
{
ArtifactTypeMappingService artifactTypeMappingService = new ArtifactTypeMappingService();
ArtifactRepository repo = new ArtifactRepository(
- createArtifacts( new String[]{"myartifact"}, null, null, new String[]{"classified"} ), MAIN_ARTIFACT_ID,
+ createArtifacts( new String[]{ "myartifact" }, null, null, new String[]{ "classified" } ), MAIN_ARTIFACT_ID,
artifactTypeMappingService );
assertNotNull( repo.getUniqueArtifact( DEFAULT_GROUPID, "myartifact", "jar" ) );
assertNotNull( repo.getUniqueArtifact( DEFAULT_GROUPID, "myartifact", "jar", "classified" ) );
@@ -76,8 +76,8 @@ public class ArtifactRepositoryTest
{
ArtifactTypeMappingService artifactTypeMappingService = new ArtifactTypeMappingService();
ArtifactRepository repo = new ArtifactRepository(
- createArtifacts( new String[]{"myartifact", "myartifact", "myartifact"}, null, null,
- new String[]{"class1", "class2", "class3"} ), MAIN_ARTIFACT_ID,
+ createArtifacts( new String[]{ "myartifact", "myartifact", "myartifact" }, null, null,
+ new String[]{ "class1", "class2", "class3" } ), MAIN_ARTIFACT_ID,
artifactTypeMappingService );
assertNull( repo.getUniqueArtifact( DEFAULT_GROUPID, "myartifact", "jar" ) );
@@ -92,8 +92,8 @@ public class ArtifactRepositoryTest
{
ArtifactTypeMappingService artifactTypeMappingService = new ArtifactTypeMappingService();
ArtifactRepository repo = new ArtifactRepository(
- createArtifacts( new String[]{"myartifact", "myartifact", "myartifact"}, null, null,
- new String[]{"class1", "class2", null} ), MAIN_ARTIFACT_ID, artifactTypeMappingService );
+ createArtifacts( new String[]{ "myartifact", "myartifact", "myartifact" }, null, null,
+ new String[]{ "class1", "class2", null } ), MAIN_ARTIFACT_ID, artifactTypeMappingService );
assertNull( repo.getUniqueArtifact( DEFAULT_GROUPID, "myartifact", "jar" ) );
assertNotNull( repo.getUniqueArtifact( DEFAULT_GROUPID, "myartifact", "jar", "class1" ) );
Modified: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/ArtifactTypeMappingServiceTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/ArtifactTypeMappingServiceTest.java?rev=992370&r1=992369&r2=992370&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/ArtifactTypeMappingServiceTest.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/ArtifactTypeMappingServiceTest.java Fri Sep 3 16:48:59 2010
@@ -20,7 +20,6 @@ package org.apache.maven.plugin.ear.util
*/
import junit.framework.TestCase;
-
import org.apache.maven.plugin.ear.EarModuleFactory;
import org.apache.maven.plugin.ear.EarPluginException;
import org.apache.maven.plugin.ear.UnknownArtifactTypeException;
Modified: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/EarMavenArchiverTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/EarMavenArchiverTest.java?rev=992370&r1=992369&r2=992370&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/EarMavenArchiverTest.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/EarMavenArchiverTest.java Fri Sep 3 16:48:59 2010
@@ -42,7 +42,7 @@ public class EarMavenArchiverTest
modules.add( module );
final EarMavenArchiver archiver = new EarMavenArchiver( modules );
- assertEquals( "foo-1.0.jar", archiver.generateClassPathEntry( "" ));
+ assertEquals( "foo-1.0.jar", archiver.generateClassPathEntry( "" ) );
}
@@ -54,7 +54,7 @@ public class EarMavenArchiverTest
modules.add( module );
final EarMavenArchiver archiver = new EarMavenArchiver( modules );
- assertEquals( "libs/foo-1.0.jar", archiver.generateClassPathEntry( "" ));
+ assertEquals( "libs/foo-1.0.jar", archiver.generateClassPathEntry( "" ) );
}
@@ -70,7 +70,7 @@ public class EarMavenArchiverTest
modules.add( module2 );
final EarMavenArchiver archiver = new EarMavenArchiver( modules );
- assertEquals( "foo-1.0.jar bar-2.0.1.war", archiver.generateClassPathEntry( "" ));
+ assertEquals( "foo-1.0.jar bar-2.0.1.war", archiver.generateClassPathEntry( "" ) );
}