hammant 2002/10/06 14:05:22
Modified: src/java/org/apache/avalon/phoenix/components/deployer Tag:
RELEASE_402-branch DefaultDeployer.java
Log:
Merge work dir contents delete from change
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/installer/DefaultInstaller.java
25 Sep 2002 12:46:00 -0000 (1.9).
Revision Changes Path
No revision
No revision
1.54.2.2 +13 -0
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/DefaultDeployer.java
Index: DefaultDeployer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/DefaultDeployer.java,v
retrieving revision 1.54.2.1
retrieving revision 1.54.2.2
diff -u -r1.54.2.1 -r1.54.2.2
--- DefaultDeployer.java 9 Sep 2002 11:30:19 -0000 1.54.2.1
+++ DefaultDeployer.java 6 Oct 2002 21:05:22 -0000 1.54.2.2
@@ -17,6 +17,7 @@
import java.util.Arrays;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
+import org.apache.avalon.excalibur.io.FileUtil;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.configuration.Configuration;
@@ -146,6 +147,18 @@
throws Exception
{
initWorkDirectory();
+ try
+ {
+ FileUtil.cleanDirectory( m_baseWorkDirectory );
+ }
+ catch( final IOException ioe )
+ {
+ final String message =
+ REZ.getString( "nodelete-workdir.error",
+ m_baseWorkDirectory,
+ ioe.getMessage() );
+ getLogger().warn( message, ioe );
+ }
setupLogger( m_installer );
setupLogger( m_assembler );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
