You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ol...@apache.org on 2013/11/04 12:11:45 UTC
svn commit: r1538555 -
/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
Author: olamy
Date: Mon Nov 4 11:11:45 2013
New Revision: 1538555
URL: http://svn.apache.org/r1538555
Log:
use better variable names
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java?rev=1538555&r1=1538554&r2=1538555&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java Mon Nov 4 11:11:45 2013
@@ -475,35 +475,35 @@ public abstract class AbstractExecWarMoj
}
}
- protected void copyDirectoryContentIntoArchive( File pSourceFolder, String pDestinationPath,
- ArchiveOutputStream pArchiveOutputSteam )
+ protected void copyDirectoryContentIntoArchive( File sourceFolder, String destinationPath,
+ ArchiveOutputStream archiveOutputSteam )
throws IOException
{
// Scan the directory
DirectoryScanner directoryScanner = new DirectoryScanner();
- directoryScanner.setBasedir( pSourceFolder );
+ directoryScanner.setBasedir( sourceFolder );
directoryScanner.addDefaultExcludes();
directoryScanner.scan();
// Each File
- for ( String aIncludeFileName : directoryScanner.getIncludedFiles() )
+ for ( String includeFileName : directoryScanner.getIncludedFiles() )
{
- getLog().debug( "include configuration file : " + pDestinationPath + aIncludeFileName );
- File aInputFile = new File( pSourceFolder, aIncludeFileName );
+ getLog().debug( "include configuration file : " + destinationPath + includeFileName );
+ File inputFile = new File( sourceFolder, includeFileName );
- FileInputStream aSourceFileInputStream = null;
+ FileInputStream sourceFileInputStream = null;
try
{
- aSourceFileInputStream = new FileInputStream( aInputFile );
+ sourceFileInputStream = new FileInputStream( inputFile );
- pArchiveOutputSteam.putArchiveEntry( new JarArchiveEntry( pDestinationPath + aIncludeFileName ) );
- IOUtils.copy( aSourceFileInputStream, pArchiveOutputSteam );
- pArchiveOutputSteam.closeArchiveEntry();
+ archiveOutputSteam.putArchiveEntry( new JarArchiveEntry( destinationPath + includeFileName ) );
+ IOUtils.copy( sourceFileInputStream, archiveOutputSteam );
+ archiveOutputSteam.closeArchiveEntry();
}
finally
{
- IOUtils.closeQuietly( aSourceFileInputStream );
+ IOUtils.closeQuietly( sourceFileInputStream );
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org