donaldp 2002/09/15 03:42:43
Modified: src/java/org/apache/avalon/phoenix/components/deployer/installer
Installer.java
Log:
Cleanups of some method signatures
Revision Changes Path
1.17 +9 -12
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/installer/Installer.java
Index: Installer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/installer/Installer.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Installer.java 15 Sep 2002 02:41:47 -0000 1.16
+++ Installer.java 15 Sep 2002 10:42:42 -0000 1.17
@@ -147,7 +147,7 @@
//Get Zipfile representing .sar file
final ZipFile zipFile = new ZipFile( file );
- return install( name, url, file, zipFile );
+ return installArchive( name, url, file, zipFile );
}
catch( final IOException ioe )
{
@@ -184,10 +184,10 @@
* @param zipFile the ZipFile representing sar
* @return the Installation object
*/
- private Installation install( final String name,
- final URL url,
- final File file,
- final ZipFile zipFile )
+ private Installation installArchive( final String name,
+ final URL url,
+ final File file,
+ final ZipFile zipFile )
throws InstallationException
{
final File directory =
@@ -199,8 +199,7 @@
final ArrayList jars = new ArrayList();
- final File workDir =
- getRelativeWorkDir( m_baseWorkDirectory, name );
+ final File workDir = getRelativeWorkDir( name );
boolean success = false;
try
{
@@ -407,16 +406,14 @@
* Create working directory inside baseWorkDir
* for specified application.
*
- * @param baseWorkDir the base workDir for all apps
* @param name the name of the application
* @return the working directory for app
*/
- private File getRelativeWorkDir( final File baseWorkDir,
- final String name )
+ private File getRelativeWorkDir( final String name )
{
final String filename =
name + "-" + System.currentTimeMillis();
- return new File( baseWorkDir, filename );
+ return new File( m_baseWorkDirectory, filename );
}
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
